videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc' 

* commit '8d26c193fb42d08602ac93ece039d4718d029adc':
  avdevice: Apply a more consistent file naming scheme

Conflicts:
	libavdevice/Makefile
	libavdevice/alsa.h
	libavdevice/alsa_dec.c
	libavdevice/alsa_enc.c
	libavdevice/sndio_enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-04-09 21:36:42 +02:00
parent 259fd4c7cf 8d26c193fb
commit b1b58310d0
14 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavdevice/Makefile
View File

@ -10,10 +10,8 @@ OBJS = alldevices.o \
utils.o \
# input/output devices
OBJS-$(CONFIG_ALSA_INDEV) += alsa-audio-common.o \
alsa-audio-dec.o timefilter.o
OBJS-$(CONFIG_ALSA_OUTDEV) += alsa-audio-common.o \
alsa-audio-enc.o
OBJS-$(CONFIG_ALSA_INDEV) += alsa_dec.o alsa.o timefilter.o
OBJS-$(CONFIG_ALSA_OUTDEV) += alsa_enc.o alsa.o
OBJS-$(CONFIG_AVFOUNDATION_INDEV) += avfoundation.o
OBJS-$(CONFIG_BKTR_INDEV) += bktr.o
OBJS-$(CONFIG_CACA_OUTDEV) += caca.o
@ -29,20 +27,20 @@ OBJS-$(CONFIG_FBDEV_OUTDEV) += fbdev_enc.o \
fbdev_common.o
OBJS-$(CONFIG_GDIGRAB_INDEV) += gdigrab.o
OBJS-$(CONFIG_IEC61883_INDEV) += iec61883.o
OBJS-$(CONFIG_JACK_INDEV) += jack_audio.o timefilter.o
OBJS-$(CONFIG_JACK_INDEV) += jack.o timefilter.o
OBJS-$(CONFIG_LAVFI_INDEV) += lavfi.o
OBJS-$(CONFIG_OPENAL_INDEV) += openal-dec.o
OBJS-$(CONFIG_OPENGL_OUTDEV) += opengl_enc.o
OBJS-$(CONFIG_OSS_INDEV) += oss_audio.o oss_audio_dec.o
OBJS-$(CONFIG_OSS_OUTDEV) += oss_audio.o oss_audio_enc.o
OBJS-$(CONFIG_OSS_INDEV) += oss_dec.o oss.o
OBJS-$(CONFIG_OSS_OUTDEV) += oss_enc.o oss.o
OBJS-$(CONFIG_PULSE_INDEV) += pulse_audio_dec.o \
pulse_audio_common.o timefilter.o
OBJS-$(CONFIG_PULSE_OUTDEV) += pulse_audio_enc.o \
pulse_audio_common.o
OBJS-$(CONFIG_QTKIT_INDEV) += qtkit.o
OBJS-$(CONFIG_SDL_OUTDEV) += sdl.o
OBJS-$(CONFIG_SNDIO_INDEV) += sndio_common.o sndio_dec.o
OBJS-$(CONFIG_SNDIO_OUTDEV) += sndio_common.o sndio_enc.o
OBJS-$(CONFIG_SNDIO_INDEV) += sndio_dec.o sndio.o
OBJS-$(CONFIG_SNDIO_OUTDEV) += sndio_enc.o sndio.o
OBJS-$(CONFIG_V4L2_INDEV) += v4l2.o v4l2-common.o timefilter.o
OBJS-$(CONFIG_V4L2_OUTDEV) += v4l2enc.o v4l2-common.o
OBJS-$(CONFIG_V4L_INDEV) += v4l.o
@ -68,7 +66,7 @@ SKIPHEADERS-$(CONFIG_FBDEV_OUTDEV) += fbdev_common.h
SKIPHEADERS-$(CONFIG_LIBPULSE) += pulse_audio_common.h
SKIPHEADERS-$(CONFIG_V4L2_INDEV) += v4l2-common.h
SKIPHEADERS-$(CONFIG_V4L2_OUTDEV) += v4l2-common.h
SKIPHEADERS-$(HAVE_ALSA_ASOUNDLIB_H) += alsa-audio.h
SKIPHEADERS-$(HAVE_SNDIO_H) += sndio_common.h
SKIPHEADERS-$(HAVE_ALSA_ASOUNDLIB_H) += alsa.h
SKIPHEADERS-$(HAVE_SNDIO_H) += sndio.h
TESTPROGS = timefilter

2
libavdevice/alsa-audio-common.c → libavdevice/alsa.c
View File

@ -33,7 +33,7 @@
#include "libavutil/avassert.h"
#include "libavutil/channel_layout.h"
#include "alsa-audio.h"
#include "alsa.h"
static av_cold snd_pcm_format_t codec_id_to_pcm_format(int codec_id)
{

6
libavdevice/alsa-audio.h → libavdevice/alsa.h
View File

@ -27,8 +27,8 @@
* @author Benoit Fouet ( benoit fouet free fr )
*/
#ifndef AVDEVICE_ALSA_AUDIO_H
#define AVDEVICE_ALSA_AUDIO_H
#ifndef AVDEVICE_ALSA_H
#define AVDEVICE_ALSA_H
#include <alsa/asoundlib.h>
#include "config.h"
@ -101,4 +101,4 @@ int ff_alsa_extend_reorder_buf(AlsaData *s, int size);
int ff_alsa_get_device_list(AVDeviceInfoList *device_list, snd_pcm_stream_t stream_type);
#endif /* AVDEVICE_ALSA_AUDIO_H */
#endif /* AVDEVICE_ALSA_H */

2
libavdevice/alsa-audio-dec.c → libavdevice/alsa_dec.c
View File

@ -55,7 +55,7 @@
#include "libavformat/internal.h"
#include "avdevice.h"
#include "alsa-audio.h"
#include "alsa.h"
static av_cold int audio_read_header(AVFormatContext *s1)
{

2
libavdevice/alsa-audio-enc.c → libavdevice/alsa_enc.c
View File

@ -45,7 +45,7 @@
#include "libavformat/internal.h"
#include "avdevice.h"
#include "alsa-audio.h"
#include "alsa.h"
static av_cold int audio_write_header(AVFormatContext *s1)
{

0
libavdevice/jack_audio.c → libavdevice/jack.c
View File

2
libavdevice/oss_audio.c → libavdevice/oss.c
View File

@ -40,7 +40,7 @@
#include "libavcodec/avcodec.h"
#include "avdevice.h"
#include "oss_audio.h"
#include "oss.h"
int ff_oss_audio_open(AVFormatContext *s1, int is_output,
const char *audio_device)

6
libavdevice/oss_audio.h → libavdevice/oss.h
View File

@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVDEVICE_OSS_AUDIO_H
#define AVDEVICE_OSS_AUDIO_H
#ifndef AVDEVICE_OSS_H
#define AVDEVICE_OSS_H
#include "libavcodec/avcodec.h"
@ -42,4 +42,4 @@ int ff_oss_audio_open(AVFormatContext *s1, int is_output,
int ff_oss_audio_close(OSSAudioData *s);
#endif /* AVDEVICE_OSS_AUDIO_H */
#endif /* AVDEVICE_OSS_H */

2
libavdevice/oss_audio_dec.c → libavdevice/oss_dec.c
View File

@ -44,7 +44,7 @@
#include "avdevice.h"
#include "libavformat/internal.h"
#include "oss_audio.h"
#include "oss.h"
static int audio_read_header(AVFormatContext *s1)
{

2
libavdevice/oss_audio_enc.c → libavdevice/oss_enc.c
View File

@ -40,7 +40,7 @@
#include "avdevice.h"
#include "libavformat/internal.h"
#include "oss_audio.h"
#include "oss.h"
static int audio_write_header(AVFormatContext *s1)
{

2
libavdevice/sndio_common.c → libavdevice/sndio.c
View File

@ -24,7 +24,7 @@
#include "avdevice.h"
#include "sndio_common.h"
#include "libavdevice/sndio.h"
static inline void movecb(void *addr, int delta)
{

6
libavdevice/sndio_common.h → libavdevice/sndio.h
View File

@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVDEVICE_SNDIO_COMMON_H
#define AVDEVICE_SNDIO_COMMON_H
#ifndef AVDEVICE_SNDIO_H
#define AVDEVICE_SNDIO_H
#include <stdint.h>
#include <sndio.h>
@ -45,4 +45,4 @@ typedef struct SndioData {
int ff_sndio_open(AVFormatContext *s1, int is_output, const char *audio_device);
int ff_sndio_close(SndioData *s);
#endif /* AVDEVICE_SNDIO_COMMON_H */
#endif /* AVDEVICE_SNDIO_H */

2
libavdevice/sndio_dec.c
View File

@ -29,7 +29,7 @@
#include "libavformat/avformat.h"
#include "libavformat/internal.h"
#include "sndio_common.h"
#include "libavdevice/sndio.h"
static av_cold int audio_read_header(AVFormatContext *s1)
{

4
libavdevice/sndio_enc.c
View File

@ -25,8 +25,8 @@
#include "libavutil/internal.h"
#include "avdevice.h"
#include "sndio_common.h"
#include "libavdevice/avdevice.h"
#include "libavdevice/sndio.h"
static av_cold int audio_write_header(AVFormatContext *s1)
{