diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-20 02:44:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-20 02:44:22 +0100 |
| commit | 1667152a9c1af2ca978f005bb095e479ef7a3107 (patch) | |
| tree | cca08cf9c559a88bc6672b16a6889ca294482e68 | |
| parent | ba4bcb191aa8b5fa66131544bf9ebf1f17ff7d9a (diff) | |
| parent | acb571c89a065d943163c11efb46de35774f1909 (diff) | |
| download | ffmpeg-1667152a9c1af2ca978f005bb095e479ef7a3107.tar.gz | |
Merge commit 'acb571c89a065d943163c11efb46de35774f1909'
* commit 'acb571c89a065d943163c11efb46de35774f1909':
avcodec: bump minor for adaptive h264 frame-mt
avconv: pass the actually selected decoder to filter_codec_opts().
Conflicts:
Changelog
ffmpeg_opt.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -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, \ |