[vlc-commits] commit: Mde GrabVideo() in v4l2.c a bit easier to follow. (Laurent Aimar )

git at videolan.org git at videolan.org
Sun Oct 31 13:05:27 CET 2010


vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sun Oct 31 12:29:25 2010 +0100| [f5d49c0ea1672125c3d6ddb5dbcf1d99dbc1817e] | committer: Laurent Aimar 

Mde GrabVideo() in v4l2.c a bit easier to follow.

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

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

diff --git a/modules/access/v4l2.c b/modules/access/v4l2.c
index 3fbb7a3..0148797 100644
--- a/modules/access/v4l2.c
+++ b/modules/access/v4l2.c
@@ -1348,7 +1348,7 @@ static int Demux( demux_t *p_demux )
  *****************************************************************************/
 static block_t* GrabVideo( vlc_object_t *p_demux, demux_sys_t *p_sys )
 {
-    block_t *p_block = NULL;
+    block_t *p_block;
     struct v4l2_buffer buf;
     ssize_t i_ret;
 
@@ -1477,7 +1477,7 @@ static block_t* GrabVideo( vlc_object_t *p_demux, demux_sys_t *p_sys )
         break;
 
     default:
-        break;
+        return NULL;
     }
 
     /* Timestamp */



More information about the vlc-commits mailing list