diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-19 19:12:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-19 19:12:30 +0200 |
| commit | ef1d4ee2f8b621a009d482d5b183a905bcb1cd74 (patch) | |
| tree | 88d5e961383f04d5c1e521242dc2e0ceb7eedd1b /libavutil/frame.h | |
| parent | af72f62d7b2ab00d6f69c0838f662beb566862d8 (diff) | |
| parent | bddd8cbf68551f6405b2bf77cc3e212af9fbe834 (diff) | |
Merge commit 'bddd8cbf68551f6405b2bf77cc3e212af9fbe834'
* commit 'bddd8cbf68551f6405b2bf77cc3e212af9fbe834':
Add transformation matrix API.
Conflicts:
libavcodec/avcodec.h
libavcodec/utils.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/frame.h')
| -rw-r--r-- | libavutil/frame.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libavutil/frame.h b/libavutil/frame.h index ccc86d72c5..dd85174ba8 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -96,6 +96,14 @@ enum AVFrameSideDataType { * ReplayGain information in the form of the AVReplayGain struct. */ AV_FRAME_DATA_REPLAYGAIN, + /** + * This side data contains a 3x3 transformation matrix describing an affine + * transformation that needs to be applied to the frame for correct + * presentation. + * + * See libavutil/display.h for a detailed description of the data. + */ + AV_FRAME_DATA_DISPLAYMATRIX, }; typedef struct AVFrameSideData { |