commit f3a6ad22c977c8fea87c4c5e4535061db6324d66
author Anton Khirnov <anton@khirnov.net> Fri Apr 04 17:38:04 2014
committer Anton Khirnov <anton@khirnov.net> Sat May 03 19:43:05 2014
tree cd62318f1dd4cbdc303538f5c2fcde0bc20543b5
parent 73ed8558a61c4f1d0ce8d1f35183ac1a0a4e31e3

avconv: rename InputStream.opts to InputStream.decoder_opts

This makes it more clear what is this variable for exactly.

avconv_opt.c

diff --git a/avconv_opt.c b/avconv_opt.c
index ae6c48b..22f598e 100644
--- a/avconv_opt.c
+++ b/avconv_opt.c
@@ -492,7 +492,7 @@
         }
 
         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);
+        ist->decoder_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:
@@ -754,7 +754,7 @@
     unused_opts = strip_specifiers(o->g->codec_opts);
     for (i = f->ist_index; i < nb_input_streams; i++) {
         e = NULL;
-        while ((e = av_dict_get(input_streams[i]->opts, "", e,
+        while ((e = av_dict_get(input_streams[i]->decoder_opts, "", e,
                                 AV_DICT_IGNORE_SUFFIX)))
             av_dict_set(&unused_opts, e->key, NULL, 0);
     }