har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check the return value of device_try_init() immediately after calling such a

Browse Source 
function. Avoids the following warning:
libavdevice/v4l2.c: In function ‘v4l2_read_header’:
libavdevice/v4l2.c:586: warning: ‘codec_id’ may be used uninitialized in this function

Originally committed as revision 22986 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Luca Abeni 2010-04-28 08:02:52 +00:00
parent 337104ac1f
commit b01dba14f3
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavdevice/v4l2.c
View File

@ -616,9 +616,6 @@ static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap)
} }
desired_format = device_try_init(s1, ap, &s->width, &s->height, &codec_id); desired_format = device_try_init(s1, ap, &s->width, &s->height, &codec_id);
if (avcodec_check_dimensions(s1, s->width, s->height) < 0)
return AVERROR(EINVAL);
if (desired_format == 0) { if (desired_format == 0) {
av_log(s1, AV_LOG_ERROR, "Cannot find a proper format for " av_log(s1, AV_LOG_ERROR, "Cannot find a proper format for "
"codec_id %d, pix_fmt %d.\n", s1->video_codec_id, ap->pix_fmt); "codec_id %d, pix_fmt %d.\n", s1->video_codec_id, ap->pix_fmt);
@ -626,6 +623,8 @@ static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap)
return AVERROR(EIO); return AVERROR(EIO);
} }
if (avcodec_check_dimensions(s1, s->width, s->height) < 0)
return AVERROR(EINVAL);
s->frame_format = desired_format; s->frame_format = desired_format;
if( v4l2_set_parameters( s1, ap ) < 0 ) if( v4l2_set_parameters( s1, ap ) < 0 )