diff options
| author | Diego Biurrun <diego@biurrun.de> | 2015-03-27 12:40:23 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2015-04-09 16:40:12 +0200 |
| commit | 8d26c193fb42d08602ac93ece039d4718d029adc (patch) | |
| tree | ced4ff3f94794ab9ca513dd67cedd4519ffeb591 /libavdevice/Makefile | |
| parent | c201069fac9a76e6604f9d84d76a172434d62200 (diff) | |
| download | ffmpeg-streaming-8d26c193fb42d08602ac93ece039d4718d029adc.zip ffmpeg-streaming-8d26c193fb42d08602ac93ece039d4718d029adc.tar.gz | |
avdevice: Apply a more consistent file naming scheme
Diffstat (limited to 'libavdevice/Makefile')
| -rw-r--r-- | libavdevice/Makefile | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/libavdevice/Makefile b/libavdevice/Makefile index 2a21832..dfd56be 100644 --- a/libavdevice/Makefile +++ b/libavdevice/Makefile @@ -7,19 +7,17 @@ OBJS = alldevices.o \ avdevice.o \ # input/output devices -OBJS-$(CONFIG_ALSA_INDEV) += alsa-audio-common.o \ - alsa-audio-dec.o -OBJS-$(CONFIG_ALSA_OUTDEV) += alsa-audio-common.o \ - alsa-audio-enc.o +OBJS-$(CONFIG_ALSA_INDEV) += alsa_dec.o alsa.o +OBJS-$(CONFIG_ALSA_OUTDEV) += alsa_enc.o alsa.o OBJS-$(CONFIG_BKTR_INDEV) += bktr.o OBJS-$(CONFIG_DV1394_INDEV) += dv1394.o OBJS-$(CONFIG_FBDEV_INDEV) += fbdev.o -OBJS-$(CONFIG_JACK_INDEV) += jack_audio.o timefilter.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_JACK_INDEV) += jack.o timefilter.o +OBJS-$(CONFIG_OSS_INDEV) += oss_dec.o oss.o +OBJS-$(CONFIG_OSS_OUTDEV) += oss_enc.o oss.o OBJS-$(CONFIG_PULSE_INDEV) += pulse.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 OBJS-$(CONFIG_VFWCAP_INDEV) += vfwcap.o OBJS-$(CONFIG_X11GRAB_INDEV) += x11grab.o @@ -31,7 +29,7 @@ OBJS-$(CONFIG_LIBDC1394_INDEV) += libdc1394.o OBJS-$(HAVE_LIBC_MSVCRT) += file_open.o -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 |
