From 758f929d212dd9feb7d40833e96c22018e4d4412 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 1 Jun 2014 17:08:17 +0200 Subject: ffmpeg: Fix choose_pixel_fmt() so it uses the correct encoding context Signed-off-by: Michael Niedermayer --- ffmpeg_opt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ffmpeg_opt.c') 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); -- cgit v1.2.3