diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-08 12:43:50 +0100 |
---|---|---|
committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-11-08 14:21:46 +0100 |
commit | 56e11cbe323747ed07ea9ce7823876ea2a9221f6 (patch) | |
tree | 1579204bba1270284269ea531e33f64b0dba69d0 | |
parent | 2be7d565bb2af0e5041378e74227520790f50257 (diff) | |
download | ffmpeg-56e11cbe323747ed07ea9ce7823876ea2a9221f6.tar.gz |
Revert "v4l2: setting device parameters early"
This reverts commit b1ad9312331759679a9c956233716a67ae681d89.
Fixes Ticket #3517
Requested-by: Giorgio Vazzana <mywing81@gmail.com>
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6f21fb793238ab6a790b94b86084148d99373ddf)
Conflicts:
libavdevice/v4l2.c
-rw-r--r-- | libavdevice/v4l2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index cf7a92cdd4..8bfe3de253 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -873,9 +873,6 @@ static int v4l2_read_header(AVFormatContext *ctx) avpriv_set_pts_info(st, 64, 1, 1000000); /* 64 bits pts in us */ - if ((res = v4l2_set_parameters(ctx)) < 0) - goto fail; - if (s->pixel_format) { AVCodec *codec = avcodec_find_decoder_by_name(s->pixel_format); @@ -926,6 +923,9 @@ static int v4l2_read_header(AVFormatContext *ctx) s->frame_format = desired_format; + if ((res = v4l2_set_parameters(ctx)) < 0) + goto fail; + st->codec->pix_fmt = avpriv_fmt_v4l2ff(desired_format, codec_id); s->frame_size = avpicture_get_size(st->codec->pix_fmt, s->width, s->height); |