[FFmpeg-cvslog] avcodec: Add forgotten minor bump, add Changelog and add Cineform to general.texi

Kieran Kunhya git at videolan.org
Sat Jan 30 19:10:42 CET 2016


ffmpeg | branch: master | Kieran Kunhya <kieran at kunhya.com> | Sat Jan 30 18:09:36 2016 +0000| [32bf4a72e326a2c18b45672e6b8ec9d4a71d47da] | committer: Kieran Kunhya

avcodec: Add forgotten minor bump, add Changelog and add Cineform to general.texi

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

 Changelog            |    1 +
 doc/general.texi     |    1 +
 libavcodec/version.h |    2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Changelog b/Changelog
index c0be305..2d7ad06 100644
--- a/Changelog
+++ b/Changelog
@@ -60,6 +60,7 @@ version <next>:
 - libquvi support removed
 - support for dvaudio in wav and avi
 - libaacplus and libvo-aacenc support removed
+- Cineform HD decoder
 
 
 version 2.8:
diff --git a/doc/general.texi b/doc/general.texi
index 4e6698c..59ea4f4 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -276,6 +276,7 @@ library:
 @item CD+G                      @tab   @tab X
     @tab Video format used by CD+G karaoke disks
 @item Phantom Cine              @tab   @tab X
+ at item Cineform HD               @tab   @tab X
 @item Commodore CDXL            @tab   @tab X
     @tab Amiga CD video format
 @item Core Audio Format         @tab X @tab X
diff --git a/libavcodec/version.h b/libavcodec/version.h
index ae8f2ba..5740137 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -29,7 +29,7 @@
 #include "libavutil/version.h"
 
 #define LIBAVCODEC_VERSION_MAJOR  57
-#define LIBAVCODEC_VERSION_MINOR  23
+#define LIBAVCODEC_VERSION_MINOR  24
 #define LIBAVCODEC_VERSION_MICRO 100
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \



More information about the ffmpeg-cvslog mailing list