Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavdevice / alldevices.c

diff --git a/libavdevice/alldevices.c b/libavdevice/alldevices.c
index 161c3b4db09482d63a7969db2ac562de881e7e2d..86ebfee06279f2b165c95bc8d76b0668101e930f 100644 (file)
--- a/libavdevice/alldevices.c
+++ b/libavdevice/alldevices.c
@@ -51,7 +51,7 @@ void avdevice_register_all(void)
     REGISTER_OUTDEV   (SDL, sdl);
     REGISTER_INOUTDEV (SNDIO, sndio);
     REGISTER_INDEV    (V4L2, v4l2);
-    REGISTER_INDEV    (V4L, v4l);
+//    REGISTER_INDEV    (V4L, v4l
     REGISTER_INDEV    (VFWCAP, vfwcap);
     REGISTER_INDEV    (X11_GRAB_DEVICE, x11_grab_device);