[FFmpeg-cvslog] avcodec: bump minor for adaptive h264 frame-mt

[Janne Grunau]

ffmpeg | branch: master | Janne Grunau <janne-libav at jannau.net> | Tue Dec 18 20:11:28 2012 +0100| [acb571c89a065d943163c11efb46de35774f1909] | committer: Janne Grunau

avcodec: bump minor for adaptive h264 frame-mt

Also adds forgotten Changelog entry.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=acb571c89a065d943163c11efb46de35774f1909
---

 Changelog            |    1 +
 libavcodec/version.h |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Changelog b/Changelog
index b4a8e60..8dfffcf 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 d77c078..348ce99 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, \