virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity

Make read_packet fail is the v4l2 driver returns an unexpected frame size

Browse Source 
(driver's bug? If not, we will have to support this in some way)

Originally committed as revision 6756 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Luca Abeni 2006-10-22 09:56:08 +00:00
parent 39a94d24f7
commit 7c7e7464e3
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/v4l2.c
View File

@ -308,7 +308,12 @@ static int mmap_read_frame(struct video_data *s, void *frame, int64_t *ts)
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;