diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-28 00:17:56 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-28 00:17:56 +0400 |
commit | 6d13499be04a610b6ce4c445eac768244ee04d64 (patch) | |
tree | 369940f19a4f83b5a7eec7d5cf2f044de6f84339 /ffmpeg.c | |
parent | e99c4bbdf3ddaf8d68c8eb882eda2c2c36219235 (diff) |
cmdutils: pass AVCodec to filter_codec_opts()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r-- | ffmpeg.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -3189,7 +3189,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); @@ -3546,7 +3546,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); |