[vlc-commits] v4l2: detect and use the Sundtek driver

[Rémi Denis-Courmont]

vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Fri Sep 12 18:55:47 2014 +0300| [50b20beb87d8d2571e7534027133e14ad828d8d3] | committer: Rémi Denis-Courmont

v4l2: detect and use the Sundtek driver

(cherry picked from commit 8bf55dd42dd50f4340d52ab4528c150ad1187f93)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=50b20beb87d8d2571e7534027133e14ad828d8d3
---

 modules/access/v4l2/lib.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/access/v4l2/lib.c b/modules/access/v4l2/lib.c
index cf2b480..3a4400a 100644
--- a/modules/access/v4l2/lib.c
+++ b/modules/access/v4l2/lib.c
@@ -48,7 +48,11 @@ static int fd_open (int fd, int flags)
 
 static void v4l2_lib_load (void)
 {
-    void *h = dlopen ("libv4l2.so.0", RTLD_LAZY | RTLD_LOCAL);
+    void *h;
+
+    h = dlopen ("libmediaclient.so", RTLD_LAZY | RTLD_LOCAL | RTLD_NOLOAD);
+    if (h == NULL)
+        h = dlopen ("libv4l2.so.0", RTLD_LAZY | RTLD_LOCAL);
     if (h == NULL)
         goto fallback;