Remove newly unused variables.

[ffmpeg.git] / libavdevice / alldevices.c

diff --git a/libavdevice/alldevices.c b/libavdevice/alldevices.c
index fd7223a915c353be2b588fc53d3310e90430ba74..6dfd350264b9ab719747d2eb976fc5661af99d60 100644 (file)
--- a/libavdevice/alldevices.c
+++ b/libavdevice/alldevices.c
@@ -17,34 +17,36 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#include "avformat.h"
-#include "avdevice.h"
 
-#define REGISTER_OUTDEV(X,x) { \
+#include "config.h"
+#include "libavformat/avformat.h"
+
+#define REGISTER_MUXER(X,x) { \
           extern AVOutputFormat x##_muxer; \
           if(ENABLE_##X##_MUXER)   av_register_output_format(&x##_muxer); }
-#define REGISTER_INDEV(X,x) { \
+#define REGISTER_DEMUXER(X,x) { \
           extern AVInputFormat x##_demuxer; \
           if(ENABLE_##X##_DEMUXER) av_register_input_format(&x##_demuxer); }
-#define REGISTER_INOUTDEV(X,x)  REGISTER_INDEV(X,x); REGISTER_OUTDEV(X,x)
+#define REGISTER_MUXDEMUX(X,x)  REGISTER_MUXER(X,x); REGISTER_DEMUXER(X,x)
 
 void avdevice_register_all(void)
 {
-    static int inited;
+    static int initialized;
 
-    if (inited)
+    if (initialized)
         return;
-    inited = 1;
+    initialized = 1;
 
     /* devices */
-    REGISTER_INOUTDEV (AUDIO_BEOS, audio_beos);
-    REGISTER_INDEV    (BKTR, bktr);
-    REGISTER_INDEV    (DV1394, dv1394);
-    REGISTER_INOUTDEV (OSS, oss);
-    REGISTER_INDEV    (V4L2, v4l2);
-    REGISTER_INDEV    (V4L, v4l);
-    REGISTER_INDEV    (X11_GRAB_DEVICE, x11_grab_device);
+    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  (VFWCAP, vfwcap);
+    REGISTER_DEMUXER  (X11_GRAB_DEVICE, x11_grab_device);
 
     /* external libraries */
-    REGISTER_INDEV    (LIBDC1394, libdc1394);
+    REGISTER_DEMUXER  (LIBDC1394, libdc1394);
 }