diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-01 17:08:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-01 17:16:08 +0200 |
| commit | 758f929d212dd9feb7d40833e96c22018e4d4412 (patch) | |
| tree | da3ed1fb5aadf7575f78e2b8e968b1b951a73a03 /ffmpeg_opt.c | |
| parent | 00dcb1063110fc417f4e98b3dad3479ed9d35eef (diff) | |
| download | ffmpeg-758f929d212dd9feb7d40833e96c22018e4d4412.tar.gz | |
ffmpeg: Fix choose_pixel_fmt() so it uses the correct encoding context
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
| -rw-r--r-- | ffmpeg_opt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index 807d54ad27..d90edc1fbb 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -1631,7 +1631,7 @@ static int read_ffserver_streams(OptionsContext *o, AVFormatContext *s, const ch if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO && !ost->stream_copy) choose_sample_fmt(st, codec); else if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO && !ost->stream_copy) - choose_pixel_fmt(st, codec, st->codec->pix_fmt); + choose_pixel_fmt(st, st->codec, codec, st->codec->pix_fmt); } avformat_close_input(&ic); |