[vlc-commits] udev: drop V4L1 support

Rémi Denis-Courmont git at videolan.org
Mon Jul 11 21:40:50 CEST 2011


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Jul 11 22:40:41 2011 +0300| [0361794c93d780bf6fec4a2c8cee43801b767972] | committer: Rémi Denis-Courmont

udev: drop V4L1 support

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0361794c93d780bf6fec4a2c8cee43801b767972
---

 modules/services_discovery/udev.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/services_discovery/udev.c b/modules/services_discovery/udev.c
index 80a9bce..91c50fa 100644
--- a/modules/services_discovery/udev.c
+++ b/modules/services_discovery/udev.c
@@ -409,13 +409,13 @@ static bool is_v4l_legacy (struct udev_device *dev)
 static char *v4l_get_mrl (struct udev_device *dev)
 {
     /* Determine media location */
-    const char *scheme = "v4l2";
     if (is_v4l_legacy (dev))
-        scheme = "v4l";
+        return NULL;
+
     const char *node = udev_device_get_devnode (dev);
     char *mrl;
 
-    if (asprintf (&mrl, "%s://%s", scheme, node) == -1)
+    if (asprintf (&mrl, "v4l2://%s", node) == -1)
         mrl = NULL;
     return mrl;
 }



More information about the vlc-commits mailing list