diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-12-15 11:45:59 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-12-18 20:15:06 +0100 |
| commit | e82cb79adf3bf560e1b2b2adb2526f61a30997e0 (patch) | |
| tree | 656889d2c327afe76230059875fed55e0c2af3f0 /avconv_opt.c | |
| parent | 77bd1bc73a1946b0f0ce09a7cbb242a65e138d06 (diff) | |
| download | ffmpeg-e82cb79adf3bf560e1b2b2adb2526f61a30997e0.tar.gz | |
avconv: pass the actually selected decoder to filter_codec_opts().
Diffstat (limited to 'avconv_opt.c')
| -rw-r--r-- | avconv_opt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/avconv_opt.c b/avconv_opt.c index 7f9e5e7415..6c7017572e 100644 --- a/avconv_opt.c +++ b/avconv_opt.c @@ -448,12 +448,12 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic) ist->file_index = nb_input_files; ist->discard = 1; st->discard = AVDISCARD_ALL; - ist->opts = filter_codec_opts(o->g->codec_opts, ist->st->codec->codec_id, ic, st, NULL); ist->ts_scale = 1.0; MATCH_PER_STREAM_OPT(ts_scale, dbl, ist->ts_scale, ic, st); ist->dec = choose_decoder(o, ic, st); + ist->opts = filter_codec_opts(o->g->codec_opts, ist->st->codec->codec_id, ic, st, ist->dec); switch (dec->codec_type) { case AVMEDIA_TYPE_VIDEO: |