Commit b01dba14 authored by Luca Abeni's avatar Luca Abeni
Browse files

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

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://
parent 337104ac
......@@ -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);
if (avcodec_check_dimensions(s1, s->width, s->height) < 0)
if (desired_format == 0) {
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);
......@@ -626,6 +623,8 @@ static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap)
return AVERROR(EIO);
if (avcodec_check_dimensions(s1, s->width, s->height) < 0)
s->frame_format = desired_format;
if( v4l2_set_parameters( s1, ap ) < 0 )
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment