X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavdevice%2Falldevices.c;h=9ec9fdfc496799d750b434e220c4dec4d7c97f35;hb=9afb7061f938831248942050cfdb449e014ed427;hp=0334be8c57057b308feb226db897c39fab2bcd73;hpb=5e53486545726987ab4482321d4dcf7e23e7652f;p=ffmpeg

diff --git a/libavdevice/alldevices.c b/libavdevice/alldevices.c
index 0334be8c570..9ec9fdfc496 100644
--- a/libavdevice/alldevices.c
+++ b/libavdevice/alldevices.c
@@ -1,32 +1,34 @@
 /*
  * Register all the grabbing devices.
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#include "avformat.h"
+
+#include "config.h"
+#include "libavformat/avformat.h"
 #include "avdevice.h"
 
-#define REGISTER_MUXER(X,x) { \
-          extern AVOutputFormat x##_muxer; \
-          if(ENABLE_##X##_MUXER)   av_register_output_format(&x##_muxer); }
-#define REGISTER_DEMUXER(X,x) { \
-          extern AVInputFormat x##_demuxer; \
-          if(ENABLE_##X##_DEMUXER) av_register_input_format(&x##_demuxer); }
-#define REGISTER_MUXDEMUX(X,x)  REGISTER_MUXER(X,x); REGISTER_DEMUXER(X,x)
+#define REGISTER_OUTDEV(X,x) { \
+          extern AVOutputFormat ff_##x##_muxer; \
+          if(CONFIG_##X##_OUTDEV)  av_register_output_format(&ff_##x##_muxer); }
+#define REGISTER_INDEV(X,x) { \
+          extern AVInputFormat ff_##x##_demuxer; \
+          if(CONFIG_##X##_INDEV)   av_register_input_format(&ff_##x##_demuxer); }
+#define REGISTER_INOUTDEV(X,x)  REGISTER_OUTDEV(X,x); REGISTER_INDEV(X,x)
 
 void avdevice_register_all(void)
 {
@@ -37,14 +39,19 @@ void avdevice_register_all(void)
     initialized = 1;
 
     /* devices */
-    REGISTER_MUXDEMUX (AUDIO_BEOS, audio_beos);
-    REGISTER_DEMUXER  (BKTR, bktr);
-    REGISTER_DEMUXER  (DV1394, dv1394);
-    REGISTER_MUXDEMUX (OSS, oss);
-    REGISTER_DEMUXER  (V4L2, v4l2);
-    REGISTER_DEMUXER  (V4L, v4l);
-    REGISTER_DEMUXER  (X11_GRAB_DEVICE, x11_grab_device);
+    REGISTER_INOUTDEV (ALSA, alsa);
+    REGISTER_INDEV    (BKTR, bktr);
+    REGISTER_INDEV    (DV1394, dv1394);
+    REGISTER_INDEV    (FBDEV, fbdev);
+    REGISTER_INDEV    (JACK, jack);
+    REGISTER_INOUTDEV (OSS, oss);
+    REGISTER_INDEV    (PULSE, pulse);
+    REGISTER_INOUTDEV (SNDIO, sndio);
+    REGISTER_INDEV    (V4L2, v4l2);
+    REGISTER_INDEV    (VFWCAP, vfwcap);
+    REGISTER_INDEV    (X11GRAB, x11grab);
 
     /* external libraries */
-    REGISTER_DEMUXER  (LIBDC1394, libdc1394);
+    REGISTER_INDEV    (LIBCDIO, libcdio);
+    REGISTER_INDEV    (LIBDC1394, libdc1394);
 }