aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanne Grunau <janne-libav@jannau.net>2012-12-18 20:11:28 +0100
committerJanne Grunau <janne-libav@jannau.net>2012-12-18 20:26:53 +0100
commitacb571c89a065d943163c11efb46de35774f1909 (patch)
tree8be4842abcf06b95e838c36da52fbb1352d68c39
parente82cb79adf3bf560e1b2b2adb2526f61a30997e0 (diff)
downloadffmpeg-acb571c89a065d943163c11efb46de35774f1909.tar.gz
avcodec: bump minor for adaptive h264 frame-mt
Also adds forgotten Changelog entry.
-rw-r--r--Changelog1
-rw-r--r--libavcodec/version.h4
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 <next>:
- 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, \