diff options
| -rw-r--r-- | Changelog | 1 | ||||
| -rw-r--r-- | ffmpeg_opt.c | 2 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
3 files changed, 3 insertions, 2 deletions
@@ -46,6 +46,7 @@ version <next>: - Silicon Graphics Motion Video Compressor 1 & 2 decoder - Silicon Graphics Movie demuxer - apad filter +- adaptive frame-level multithreading for H.264 version 1.0: diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index 6867a0073a..d2478701d2 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -569,7 +569,6 @@ 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, choose_decoder(o, ic, st)); ist->ts_scale = 1.0; MATCH_PER_STREAM_OPT(ts_scale, dbl, ist->ts_scale, ic, st); @@ -583,6 +582,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->reinit_filters = -1; MATCH_PER_STREAM_OPT(reinit_filters, i, ist->reinit_filters, ic, st); diff --git a/libavcodec/version.h b/libavcodec/version.h index f980fed78f..74c8360011 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "libavutil/avutil.h" #define LIBAVCODEC_VERSION_MAJOR 54 -#define LIBAVCODEC_VERSION_MINOR 80 +#define LIBAVCODEC_VERSION_MINOR 81 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |