aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Walker <tdskywalker@gmail.com>2013-12-11 02:03:28 +0000
committerTim Walker <tdskywalker@gmail.com>2014-01-05 16:41:56 +0100
commit5c437fb672b6f6d1f423f88ef84ad5a60cb63813 (patch)
treebbb6514d16ca62b33d94e651cddce93c414de4c6
parent52ccc4a0ece88030e67254418317d72089a0ecc8 (diff)
downloadffmpeg-5c437fb672b6f6d1f423f88ef84ad5a60cb63813.tar.gz
lavu: Add values for various Dolby flags to the AVMatrixEncoding enum.
-rw-r--r--doc/APIchanges3
-rw-r--r--libavutil/channel_layout.h4
-rw-r--r--libavutil/version.h2
3 files changed, 8 insertions, 1 deletions
diff --git a/doc/APIchanges b/doc/APIchanges
index 60e16d88c5..376a74590d 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -13,6 +13,9 @@ libavutil: 2013-12-xx
API changes, most recent first:
+2013-12-xx - xxxxxxx - lavu 53.1.0 - channel_layout.h
+ Add values for various Dolby flags to the AVMatrixEncoding enum.
+
2013-12-xx - xxxxxxx - lavc 55.30.0 - avcodec.h
Add HEVC profiles
diff --git a/libavutil/channel_layout.h b/libavutil/channel_layout.h
index 15b6887a67..6a1f83005a 100644
--- a/libavutil/channel_layout.h
+++ b/libavutil/channel_layout.h
@@ -106,6 +106,10 @@ enum AVMatrixEncoding {
AV_MATRIX_ENCODING_NONE,
AV_MATRIX_ENCODING_DOLBY,
AV_MATRIX_ENCODING_DPLII,
+ AV_MATRIX_ENCODING_DPLIIX,
+ AV_MATRIX_ENCODING_DPLIIZ,
+ AV_MATRIX_ENCODING_DOLBYEX,
+ AV_MATRIX_ENCODING_DOLBYHEADPHONE,
AV_MATRIX_ENCODING_NB
};
diff --git a/libavutil/version.h b/libavutil/version.h
index ed7d13ac5a..01c932cde3 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -54,7 +54,7 @@
*/
#define LIBAVUTIL_VERSION_MAJOR 53
-#define LIBAVUTIL_VERSION_MINOR 0
+#define LIBAVUTIL_VERSION_MINOR 1
#define LIBAVUTIL_VERSION_MICRO 0
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \