[FFmpeg-cvslog] avconv: pass the actually selected decoder to filter_codec_opts().

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sat Dec 15 11:45:59 2012 +0100| [e82cb79adf3bf560e1b2b2adb2526f61a30997e0] | committer: Anton Khirnov

avconv: pass the actually selected decoder to filter_codec_opts().

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e82cb79adf3bf560e1b2b2adb2526f61a30997e0
---

 avconv_opt.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/avconv_opt.c b/avconv_opt.c
index 7f9e5e7..6c70175 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: