[Ffmpeg-cvslog] r6756 - trunk/libavformat/v4l2.c

[lucabe]

Author: lucabe
Date: Sun Oct 22 11:56:08 2006
New Revision: 6756

Modified:
   trunk/libavformat/v4l2.c

Log:
Make read_packet fail is the v4l2 driver returns an unexpected frame size
(driver's bug? If not, we will have to support this in some way)


Modified: trunk/libavformat/v4l2.c
==============================================================================
--- trunk/libavformat/v4l2.c	(original)
+++ trunk/libavformat/v4l2.c	Sun Oct 22 11:56:08 2006
@@ -308,7 +308,12 @@
         return -1;
     }
     assert (buf.index < s->buffers);
-    assert(buf.bytesused == s->frame_size);
+    if (buf.bytesused != s->frame_size) {
+        av_log(NULL, AV_LOG_ERROR, "The v4l2 frame is %d bytes, but %d bytes are expected\n", buf.bytesused, s->frame_size);
+
+        return -1;
+    }
+
     /* Image is at s->buff_start[buf.index] */
     memcpy(frame, s->buf_start[buf.index], buf.bytesused);
     *ts = buf.timestamp.tv_sec * int64_t_C(1000000) + buf.timestamp.tv_usec;