diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-05 14:44:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-05 14:44:33 +0200 |
| commit | 42b7bda41a4f7717d41b576e184da2875f7972f2 (patch) | |
| tree | b59e44f9c9d84be410d921400674122958949217 /ffmpeg_opt.c | |
| parent | 6e397074380e64b177e51d5a9ed2a96e1a5b5f7a (diff) | |
| parent | f3a6ad22c977c8fea87c4c5e4535061db6324d66 (diff) | |
Merge commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66'
* commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66':
avconv: rename InputStream.opts to InputStream.decoder_opts
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
| -rw-r--r-- | ffmpeg_opt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index 000c788032..bd2945cbf1 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -594,7 +594,7 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic) } 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); ist->reinit_filters = -1; MATCH_PER_STREAM_OPT(reinit_filters, i, ist->reinit_filters, ic, st); @@ -908,7 +908,7 @@ static int open_input_file(OptionsContext *o, const char *filename) 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); } |