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 | |
parent | 6e397074380e64b177e51d5a9ed2a96e1a5b5f7a (diff) | |
parent | f3a6ad22c977c8fea87c4c5e4535061db6324d66 (diff) | |
download | ffmpeg-streaming-42b7bda41a4f7717d41b576e184da2875f7972f2.zip ffmpeg-streaming-42b7bda41a4f7717d41b576e184da2875f7972f2.tar.gz |
Merge commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66'
* commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66':
avconv: rename InputStream.opts to InputStream.decoder_opts
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | ffmpeg.c | 10 | ||||
-rw-r--r-- | ffmpeg.h | 2 | ||||
-rw-r--r-- | ffmpeg_opt.c | 4 |
3 files changed, 8 insertions, 8 deletions
@@ -501,7 +501,7 @@ static void ffmpeg_cleanup(int ret) av_frame_free(&ist->decoded_frame); av_frame_free(&ist->filter_frame); - av_dict_free(&ist->opts); + av_dict_free(&ist->decoder_opts); avsubtitle_free(&ist->prev_sub.subtitle); av_frame_free(&ist->sub2video.frame); av_freep(&ist->filters); @@ -2249,9 +2249,9 @@ static int init_input_stream(int ist_index, char *error, int error_len) av_opt_set_int(ist->st->codec, "refcounted_frames", 1, 0); - if (!av_dict_get(ist->opts, "threads", NULL, 0)) - av_dict_set(&ist->opts, "threads", "auto", 0); - if ((ret = avcodec_open2(ist->st->codec, codec, &ist->opts)) < 0) { + if (!av_dict_get(ist->decoder_opts, "threads", NULL, 0)) + av_dict_set(&ist->decoder_opts, "threads", "auto", 0); + if ((ret = avcodec_open2(ist->st->codec, codec, &ist->decoder_opts)) < 0) { if (ret == AVERROR_EXPERIMENTAL) abort_codec_experimental(codec, 0); @@ -2261,7 +2261,7 @@ static int init_input_stream(int ist_index, char *error, int error_len) ist->file_index, ist->st->index, av_err2str(ret)); return ret; } - assert_avoptions(ist->opts); + assert_avoptions(ist->decoder_opts); } ist->next_pts = AV_NOPTS_VALUE; @@ -258,7 +258,7 @@ typedef struct InputStream { double ts_scale; int saw_first_ts; int showed_multi_packet_warning; - AVDictionary *opts; + AVDictionary *decoder_opts; AVRational framerate; /* framerate forced with -r */ int top_field_first; int guess_layout_max; diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index 000c788..bd2945c 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); } |