From e82cb79adf3bf560e1b2b2adb2526f61a30997e0 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 15 Dec 2012 11:45:59 +0100 Subject: [PATCH 1/2] avconv: pass the actually selected decoder to filter_codec_opts(). --- avconv_opt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/avconv_opt.c b/avconv_opt.c index 7f9e5e7415..6c7017572e 100644 --- a/avconv_opt.c +++ b/avconv_opt.c @@ -448,12 +448,12 @@ 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, NULL); ist->ts_scale = 1.0; MATCH_PER_STREAM_OPT(ts_scale, dbl, ist->ts_scale, ic, st); 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); switch (dec->codec_type) { case AVMEDIA_TYPE_VIDEO: From acb571c89a065d943163c11efb46de35774f1909 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Tue, 18 Dec 2012 20:11:28 +0100 Subject: [PATCH 2/2] avcodec: bump minor for adaptive h264 frame-mt Also adds forgotten Changelog entry. --- Changelog | 1 + libavcodec/version.h | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index b4a8e60a96..8dfffcfcd6 100644 --- a/Changelog +++ b/Changelog @@ -8,6 +8,7 @@ version : - deprecated the avconv -vol option. the volume filter is to be used instead. - multi-channel ALAC encoding up to 7.1 - TAK demuxer, parser, and decoder +- adaptive frame-level multithreading for H.264 version 9_beta2: diff --git a/libavcodec/version.h b/libavcodec/version.h index d77c0787f8..348ce99f2a 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -27,8 +27,8 @@ */ #define LIBAVCODEC_VERSION_MAJOR 54 -#define LIBAVCODEC_VERSION_MINOR 34 -#define LIBAVCODEC_VERSION_MICRO 1 +#define LIBAVCODEC_VERSION_MINOR 35 +#define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \