diff options
| author | Tim Walker <tdskywalker@gmail.com> | 2013-12-11 02:03:29 +0000 |
|---|---|---|
| committer | Tim Walker <tdskywalker@gmail.com> | 2014-01-05 16:41:56 +0100 |
| commit | 5b4797a21db900b7d509660b7a4d49829089b004 (patch) | |
| tree | eefc1d4f9112e3b44bb14023fc3f469ce6b7f2f0 /libavutil | |
| parent | 5c437fb672b6f6d1f423f88ef84ad5a60cb63813 (diff) | |
| download | ffmpeg-5b4797a21db900b7d509660b7a4d49829089b004.tar.gz | |
avframe: add AV_FRAME_DATA_MATRIXENCODING side data type.
Includes a libavcodec utility function to update a frame's side data.
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/frame.h | 4 | ||||
| -rw-r--r-- | libavutil/version.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/libavutil/frame.h b/libavutil/frame.h index 16e2177bd2..b02516592f 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -46,6 +46,10 @@ enum AVFrameSideDataType { * The data is the AVStereo3D struct defined in libavutil/stereo3d.h. */ AV_FRAME_DATA_STEREO3D, + /** + * The data is the AVMatrixEncoding enum defined in libavutil/channel_layout.h. + */ + AV_FRAME_DATA_MATRIXENCODING, }; typedef struct AVFrameSideData { diff --git a/libavutil/version.h b/libavutil/version.h index 01c932cde3..e95d77c600 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -54,7 +54,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 53 -#define LIBAVUTIL_VERSION_MINOR 1 +#define LIBAVUTIL_VERSION_MINOR 2 #define LIBAVUTIL_VERSION_MICRO 0 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |