[vlc-devel] commit: Oops. b_demux should be flase (Antoine Cellerier )

[git version control]

vlc | branch: master | Antoine Cellerier <dionoea at videolan.org> | Thu Apr  2 22:54:09 2009 +0200| [b694b642baea32dfa21ec9d771ef7295ac398d6d] | committer: Antoine Cellerier 

Oops. b_demux should be flase

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

 modules/access/v4l2.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/access/v4l2.c b/modules/access/v4l2.c
index 33f8299..4188421 100644
--- a/modules/access/v4l2.c
+++ b/modules/access/v4l2.c
@@ -1068,7 +1068,7 @@ static int AccessOpen( vlc_object_t * p_this )
     {
         msg_Dbg( p_this, "Trying direct kernel v4l2" );
         use_kernel_v4l2( p_sys );
-        if( FindMainDevice( p_this, p_sys, true ) == VLC_SUCCESS)
+        if( FindMainDevice( p_this, p_sys, false ) == VLC_SUCCESS)
             return VLC_SUCCESS;
     }
 
@@ -1854,6 +1854,7 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, bool b_demux )
     ControlList( p_obj, p_sys, i_fd,
                   var_GetBool( p_obj, "v4l2-controls-reset" ), b_demux );
     SetAvailControlsByString( p_obj, p_sys, i_fd );
+
     if( false == b_demux)
     {
         return i_fd;
@@ -1867,7 +1868,7 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, bool b_demux )
         case IO_METHOD_READ:
             if( !(p_sys->dev_cap.capabilities & V4L2_CAP_READWRITE) )
             {
-                msg_Err( p_demux, "device does not support read i/o" );
+                msg_Err( p_obj, "device does not support read i/o" );
                 goto open_failed;
             }
             break;
@@ -1876,13 +1877,13 @@ static int OpenVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, bool b_demux )
         case IO_METHOD_USERPTR:
             if( !(p_sys->dev_cap.capabilities & V4L2_CAP_STREAMING) )
             {
-                msg_Err( p_demux, "device does not support streaming i/o" );
+                msg_Err( p_obj, "device does not support streaming i/o" );
                 goto open_failed;
             }
             break;
 
         default:
-            msg_Err( p_demux, "io method not supported" );
+            msg_Err( p_obj, "io method not supported" );
             goto open_failed;
     }