diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-05 22:12:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-05 22:12:41 +0100 |
| commit | 4cf4da9dc5814aebe8881d93b4a88f593b774448 (patch) | |
| tree | 70a7c6514dd14c1a08e2d0f31d85279961e53504 /libavutil/frame.h | |
| parent | 751385fe3f6537b2f9d04d2055d23f49f5196efa (diff) | |
| parent | 5b4797a21db900b7d509660b7a4d49829089b004 (diff) | |
| download | ffmpeg-4cf4da9dc5814aebe8881d93b4a88f593b774448.tar.gz | |
Merge commit '5b4797a21db900b7d509660b7a4d49829089b004'
* commit '5b4797a21db900b7d509660b7a4d49829089b004':
avframe: add AV_FRAME_DATA_MATRIXENCODING side data type.
Conflicts:
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/frame.h')
| -rw-r--r-- | libavutil/frame.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavutil/frame.h b/libavutil/frame.h index b31cc3ec4c..1222d3c9e1 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -69,6 +69,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 { |