libv4l: add /dev/v4l/ to the paths supported by open() override

Signed-off-by: Brandon Philips <bphilips@suse.de>

3 files changed, 14 insertions, 14 deletions

diff --git a/v4l2-apps/lib/libv4l/libv4l1/libv4l1.c b/v4l2-apps/lib/libv4l/libv4l1/libv4l1.c
index b80fcb56d..80d2fa09b 100644
--- a/v4l2-apps/lib/libv4l/libv4l1/libv4l1.c
+++ b/v4l2-apps/lib/libv4l/libv4l1/libv4l1.c
@@ -28,12 +28,12 @@
       capture only devices, or non v4l2 devices.
    2) libv4l1 is the base of the v4l1compat.so wrapper lib, which is a .so
       which can be LD_PRELOAD-ed and the overrules the libc's open/close/etc,
-      and when opening /dev/videoX calls v4l1_open. Because we behave as the
-      regular counterpart when the fd is not known (instead of say throwing
-      an error), v4l1compat.so can simply call the v4l1_ prefixed function
-      for all wrapped functions. This way the wrapper does not have to keep
-      track of which fd's are being handled by libv4l1, as libv4l1 already
-      keeps track of this itself.
+      and when opening /dev/videoX or /dev/v4l/ calls v4l1_open. Because we
+      behave as the regular counterpart when the fd is not known (instead of
+      say throwing an error), v4l1compat.so can simply call the v4l1_ prefixed
+      function for all wrapped functions. This way the wrapper does not have
+      to keep track of which fd's are being handled by libv4l1, as libv4l1
+      already keeps track of this itself.
 
       This also means that libv4l1 may not use any of the regular functions
       it mimics, as for example open could be a symbol in v4l1compat.so, which
@@ -279,7 +279,7 @@ int v4l1_open (const char *file, int oflag, ...)
     return fd;
 
   /* check if we're opening a video4linux2 device */
-  if (strncmp(file, "/dev/video", 10))
+  if (strncmp(file, "/dev/video", 10) && strncmp(file, "/dev/v4l/", 9))
     return fd;
 
   /* check that this is an v4l2 device, no need to emulate v4l1 on
diff --git a/v4l2-apps/lib/libv4l/libv4l2/libv4l2.c b/v4l2-apps/lib/libv4l/libv4l2/libv4l2.c
index f71d176b5..174c05b36 100644
--- a/v4l2-apps/lib/libv4l/libv4l2/libv4l2.c
+++ b/v4l2-apps/lib/libv4l/libv4l2/libv4l2.c
@@ -35,12 +35,12 @@
       capture devices.
    2) libv4l2 is the base of the v4l2convert.so wrapper lib, which is a .so
       which can be LD_PRELOAD-ed and the overrules the libc's open/close/etc,
-      and when opening /dev/videoX calls v4l2_open. Because we behave as the
-      regular counterpart when the fd is not known (instead of say throwing
-      an error), v4l2convert.so can simply call the v4l2_ prefixed function
-      for all wrapped functions (except for v4l2_open which will fail when not
-      called on a v4l2 device). This way the wrapper does not have to keep
-      track of which fd's are being handled by libv4l2, as libv4l2 already
+      and when opening /dev/videoX or /dev/v4l/ calls v4l2_open.  Because we
+      behave as the regular counterpart when the fd is not known (instead of say
+      throwing an error), v4l2convert.so can simply call the v4l2_ prefixed
+      function for all wrapped functions (except for v4l2_open which will fail
+      when not called on a v4l2 device). This way the wrapper does not have to
+      keep track of which fd's are being handled by libv4l2, as libv4l2 already
       keeps track of this itself.
 
       This also means that libv4l2 may not use any of the regular functions
diff --git a/v4l2-apps/lib/libv4l/libv4l2/v4l2convert.c b/v4l2-apps/lib/libv4l/libv4l2/v4l2convert.c
index 7db1ca6d6..7b64bc018 100644
--- a/v4l2-apps/lib/libv4l/libv4l2/v4l2convert.c
+++ b/v4l2-apps/lib/libv4l/libv4l2/v4l2convert.c
@@ -66,7 +66,7 @@ int open (const char *file, int oflag, ...)
     return fd;
 
   /* check if we're opening a video4linux2 device */
-  if (strncmp(file, "/dev/video", 10))
+  if (strncmp(file, "/dev/video", 10) && strncmp(file, "/dev/v4l/", 9))
     return fd;
 
   /* check that this is an v4l2 device, libv4l2 only supports v4l2 devices */