From: Stefano Sabatini Date: Wed, 6 Aug 2008 18:20:04 +0000 (+0000) Subject: Distinguish the error reporting for the cases of wrong size and wrong X-Git-Tag: v0.5~3251 X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=e78d651f065c9c6f43b06851026c554f5da682f5 Distinguish the error reporting for the cases of wrong size and wrong timebase in the video4linux grab_read_header() function. Originally committed as revision 14646 to svn://svn.ffmpeg.org/ffmpeg/trunk --- diff --git a/libavdevice/v4l.c b/libavdevice/v4l.c index 8fed08c11d..de5080c85e 100644 --- a/libavdevice/v4l.c +++ b/libavdevice/v4l.c @@ -78,10 +78,12 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap) int j; int vformat_num = sizeof(video_formats) / sizeof(video_formats[0]); - if (ap->width <= 0 || ap->height <= 0 || ap->time_base.den <= 0) { - av_log(s1, AV_LOG_ERROR, "Bad capture size (%dx%d) or wrong time base (%d)\n", - ap->width, ap->height, ap->time_base.den); - + if (ap->width <= 0 || ap->height <= 0) { + av_log(s1, AV_LOG_ERROR, "Wrong size (%dx%d)\n", ap->width, ap->height); + return -1; + } + if (ap->time_base.den <= 0) { + av_log(s1, AV_LOG_ERROR, "Wrong time base (%d)\n", ap->time_base.den); return -1; }