diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-05 21:55:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-05 21:55:58 +0100 |
| commit | 751385fe3f6537b2f9d04d2055d23f49f5196efa (patch) | |
| tree | 057e7e51bddc82f69ecde51453dbc97869604f7f | |
| parent | 847072873c95ccaa5441bdba5a50bc19de2875e0 (diff) | |
| parent | 5c437fb672b6f6d1f423f88ef84ad5a60cb63813 (diff) | |
| download | ffmpeg-751385fe3f6537b2f9d04d2055d23f49f5196efa.tar.gz | |
Merge commit '5c437fb'
* commit '5c437fb':
lavu: Add values for various Dolby flags to the AVMatrixEncoding enum.
Conflicts:
doc/APIchanges
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | doc/APIchanges | 3 | ||||
| -rw-r--r-- | libavutil/channel_layout.h | 4 | ||||
| -rw-r--r-- | libavutil/version.h | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index fe6ddce49d..7e7b15472b 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2012-10-22 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. + 2014-01-04 - xxxxxxx - lavu 52.60.100 - mathematics.h Add av_add_stable() function. diff --git a/libavutil/channel_layout.h b/libavutil/channel_layout.h index ba4f96d2d0..bc6befd8e3 100644 --- a/libavutil/channel_layout.h +++ b/libavutil/channel_layout.h @@ -114,6 +114,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 833d4ee42c..e6a0f252a0 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -56,7 +56,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 52 -#define LIBAVUTIL_VERSION_MINOR 60 +#define LIBAVUTIL_VERSION_MINOR 61 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |