From 6d13499be04a610b6ce4c445eac768244ee04d64 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 27 Nov 2011 21:17:56 +0100 Subject: cmdutils: pass AVCodec to filter_codec_opts() Signed-off-by: Michael Niedermayer --- avconv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'avconv.c') diff --git a/avconv.c b/avconv.c index 4620b2baa8..9140a2ad51 100644 --- a/avconv.c +++ b/avconv.c @@ -2963,7 +2963,7 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic) ist->st = st; ist->file_index = nb_input_files; ist->discard = 1; - ist->opts = filter_codec_opts(codec_opts, ist->st->codec->codec_id, ic, st); + ist->opts = filter_codec_opts(codec_opts, choose_decoder(o, ic, st), ic, st); ist->ts_scale = 1.0; MATCH_PER_STREAM_OPT(ts_scale, dbl, ist->ts_scale, ic, st); @@ -3302,7 +3302,7 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e st->codec->codec_type = type; choose_encoder(o, oc, ost); if (ost->enc) { - ost->opts = filter_codec_opts(codec_opts, ost->enc->id, oc, st); + ost->opts = filter_codec_opts(codec_opts, ost->enc, oc, st); } avcodec_get_context_defaults3(st->codec, ost->enc); -- cgit v1.2.3