aboutsummaryrefslogtreecommitdiffstats
path: root/libavdevice/Makefile
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2009-06-29 18:49:15 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2009-06-29 18:49:15 +0000
commit38e54a75abf2dbf41773f584a0afc6492baa099a (patch)
treef193d17e86296bcaf0592d34dc6f3e23362970ba /libavdevice/Makefile
parentd004179e197fc9be7fbefa7c38c09984517cbfed (diff)
downloadffmpeg-38e54a75abf2dbf41773f584a0afc6492baa099a.tar.gz
Make the configure script select the input/output devices using
--enable-indev, --enable-outdev rather than --enable-demuxer, --enable-muxer as before, same for disabling them. Originally committed as revision 19293 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavdevice/Makefile')
-rw-r--r--libavdevice/Makefile28
1 files changed, 14 insertions, 14 deletions
diff --git a/libavdevice/Makefile b/libavdevice/Makefile
index b769d16c76..75607aa2e1 100644
--- a/libavdevice/Makefile
+++ b/libavdevice/Makefile
@@ -8,22 +8,22 @@ HEADERS = avdevice.h
OBJS = alldevices.o
# input/output devices
-OBJS-$(CONFIG_ALSA_DEMUXER) += alsa-audio-common.o alsa-audio-dec.o
-OBJS-$(CONFIG_ALSA_MUXER) += alsa-audio-common.o alsa-audio-enc.o
-OBJS-$(CONFIG_BKTR_DEMUXER) += bktr.o
-OBJS-$(CONFIG_DV1394_DEMUXER) += dv1394.o
-OBJS-$(CONFIG_JACK_DEMUXER) += jack_audio.o
-OBJS-$(CONFIG_OSS_DEMUXER) += oss_audio.o
-OBJS-$(CONFIG_OSS_MUXER) += oss_audio.o
-OBJS-$(CONFIG_V4L2_DEMUXER) += v4l2.o
-OBJS-$(CONFIG_V4L_DEMUXER) += v4l.o
-OBJS-$(CONFIG_VFWCAP_DEMUXER) += vfwcap.o
-OBJS-$(CONFIG_X11_GRAB_DEVICE_DEMUXER) += x11grab.o
+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_BKTR_INDEV) += bktr.o
+OBJS-$(CONFIG_DV1394_INDEV) += dv1394.o
+OBJS-$(CONFIG_JACK_INDEV) += jack_audio.o
+OBJS-$(CONFIG_OSS_INDEV) += oss_audio.o
+OBJS-$(CONFIG_OSS_OUTDEV) += oss_audio.o
+OBJS-$(CONFIG_V4L2_INDEV) += v4l2.o
+OBJS-$(CONFIG_V4L_INDEV) += v4l.o
+OBJS-$(CONFIG_VFWCAP_INDEV) += vfwcap.o
+OBJS-$(CONFIG_X11_GRAB_DEVICE_INDEV) += x11grab.o
# external libraries
-OBJS-$(CONFIG_LIBDC1394_DEMUXER) += libdc1394.o
+OBJS-$(CONFIG_LIBDC1394_INDEV) += libdc1394.o
-OBJS-$(CONFIG_AUDIO_BEOS_DEMUXER) += beosaudio.o
-OBJS-$(CONFIG_AUDIO_BEOS_MUXER) += beosaudio.o
+OBJS-$(CONFIG_AUDIO_BEOS_INDEV) += beosaudio.o
+OBJS-$(CONFIG_AUDIO_BEOS_OUTDEV) += beosaudio.o
include $(SUBDIR)../subdir.mak