summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKieran Kunhya <kieran@kunhya.com>2016-01-30 18:09:36 +0000
committerKieran Kunhya <kieran@kunhya.com>2016-01-30 18:09:36 +0000
commit32bf4a72e326a2c18b45672e6b8ec9d4a71d47da (patch)
treec2227bd1a6c225f15d9daff0b393f8936ad5f966
parent3485332bf99602910fe8830b0230d02fc653135d (diff)
avcodec: Add forgotten minor bump, add Changelog and add Cineform to general.texi
-rw-r--r--Changelog1
-rw-r--r--doc/general.texi1
-rw-r--r--libavcodec/version.h2
3 files changed, 3 insertions, 1 deletions
diff --git a/Changelog b/Changelog
index c0be305742..2d7ad06cc3 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 4e6698c480..59ea4f44d9 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
+@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 ae8f2ba0e8..5740137bb8 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, \