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

3 files changed, 32 insertions, 32 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
diff --git a/libavdevice/alldevices.c b/libavdevice/alldevices.c
index 7efc42a897..1947eee88f 100644
--- a/libavdevice/alldevices.c
+++ b/libavdevice/alldevices.c
@@ -27,13 +27,13 @@ unsigned avdevice_version(void)
     return LIBAVDEVICE_VERSION_INT;
 }
 
-#define REGISTER_MUXER(X,x) { \
+#define REGISTER_OUTDEV(X,x) { \
           extern AVOutputFormat x##_muxer; \
-          if(CONFIG_##X##_MUXER)   av_register_output_format(&x##_muxer); }
-#define REGISTER_DEMUXER(X,x) { \
+          if(CONFIG_##X##_OUTDEV)  av_register_output_format(&x##_muxer); }
+#define REGISTER_INDEV(X,x) { \
           extern AVInputFormat x##_demuxer; \
-          if(CONFIG_##X##_DEMUXER) av_register_input_format(&x##_demuxer); }
-#define REGISTER_MUXDEMUX(X,x)  REGISTER_MUXER(X,x); REGISTER_DEMUXER(X,x)
+          if(CONFIG_##X##_INDEV)   av_register_input_format(&x##_demuxer); }
+#define REGISTER_INOUTDEV(X,x)  REGISTER_OUTDEV(X,x); REGISTER_INDEV(X,x)
 
 void avdevice_register_all(void)
 {
@@ -44,17 +44,17 @@ void avdevice_register_all(void)
     initialized = 1;
 
     /* devices */
-    REGISTER_MUXDEMUX (ALSA, alsa);
-    REGISTER_MUXDEMUX (AUDIO_BEOS, audio_beos);
-    REGISTER_DEMUXER  (BKTR, bktr);
-    REGISTER_DEMUXER  (DV1394, dv1394);
-    REGISTER_DEMUXER  (JACK, jack);
-    REGISTER_MUXDEMUX (OSS, oss);
-    REGISTER_DEMUXER  (V4L2, v4l2);
-    REGISTER_DEMUXER  (V4L, v4l);
-    REGISTER_DEMUXER  (VFWCAP, vfwcap);
-    REGISTER_DEMUXER  (X11_GRAB_DEVICE, x11_grab_device);
+    REGISTER_INOUTDEV (ALSA, alsa);
+    REGISTER_INOUTDEV (AUDIO_BEOS, audio_beos);
+    REGISTER_INDEV    (BKTR, bktr);
+    REGISTER_INDEV    (DV1394, dv1394);
+    REGISTER_INDEV    (JACK, jack);
+    REGISTER_INOUTDEV (OSS, oss);
+    REGISTER_INDEV    (V4L2, v4l2);
+    REGISTER_INDEV    (V4L, v4l);
+    REGISTER_INDEV    (VFWCAP, vfwcap);
+    REGISTER_INDEV    (X11_GRAB_DEVICE, x11_grab_device);
 
     /* external libraries */
-    REGISTER_DEMUXER  (LIBDC1394, libdc1394);
+    REGISTER_INDEV    (LIBDC1394, libdc1394);
 }
diff --git a/libavdevice/oss_audio.c b/libavdevice/oss_audio.c
index 8f3e678db0..a89c39ac05 100644
--- a/libavdevice/oss_audio.c
+++ b/libavdevice/oss_audio.c
@@ -312,7 +312,7 @@ static int audio_read_close(AVFormatContext *s1)
     return 0;
 }
 
-#if CONFIG_OSS_DEMUXER
+#if CONFIG_OSS_INDEV
 AVInputFormat oss_demuxer = {
     "oss",
     NULL_IF_CONFIG_SMALL("Open Sound System capture"),
@@ -325,7 +325,7 @@ AVInputFormat oss_demuxer = {
 };
 #endif
 
-#if CONFIG_OSS_MUXER
+#if CONFIG_OSS_OUTDEV
 AVOutputFormat oss_muxer = {
     "oss",
     NULL_IF_CONFIG_SMALL("Open Sound System playback"),