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 /libavcodec/avcodec.h | |
| parent | af72f62d7b2ab00d6f69c0838f662beb566862d8 (diff) | |
| parent | bddd8cbf68551f6405b2bf77cc3e212af9fbe834 (diff) | |
| download | ffmpeg-ef1d4ee2f8b621a009d482d5b183a905bcb1cd74.tar.gz | |
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 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 45a9a7de20..5bff631a6a 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1053,6 +1053,15 @@ enum AVPacketSideDataType { AV_PKT_DATA_REPLAYGAIN, /** + * This side data contains a 3x3 transformation matrix describing an affine + * transformation that needs to be applied to the decoded video frames for + * correct presentation. + * + * See libavutil/display.h for a detailed description of the data. + */ + AV_PKT_DATA_DISPLAYMATRIX, + + /** * Recommmends skipping the specified number of samples * @code * u32le number of samples to skip from start of this packet |