diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-16 02:05:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-16 02:05:29 +0100 |
| commit | a2bc6c116ddc15af47e092af874a0647d114a9f6 (patch) | |
| tree | 6232f821ac4664d831e3a74ccaac67fa2b8664f6 /libavutil/frame.h | |
| parent | fdf8b59b28cbe458ca6933bbb9394936a5fcbf91 (diff) | |
| parent | c98f3169bfb578c1a4e407b44524f0bfa3b4dc0c (diff) | |
| download | ffmpeg-a2bc6c116ddc15af47e092af874a0647d114a9f6.tar.gz | |
Merge commit 'c98f3169bfb578c1a4e407b44524f0bfa3b4dc0c'
* commit 'c98f3169bfb578c1a4e407b44524f0bfa3b4dc0c':
lavu: add AV_FRAME_DATA_DOWNMIX_INFO side data type.
Conflicts:
doc/APIchanges
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/frame.h')
| -rw-r--r-- | libavutil/frame.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavutil/frame.h b/libavutil/frame.h index 4ddb54f3d5..b423f67996 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -87,6 +87,11 @@ enum AVFrameSideDataType { * The data is the AVMatrixEncoding enum defined in libavutil/channel_layout.h. */ AV_FRAME_DATA_MATRIXENCODING, + /** + * Metadata relevant to a downmix procedure. + * The data is the AVDownmixInfo struct defined in libavutil/downmix_info.h. + */ + AV_FRAME_DATA_DOWNMIX_INFO, }; typedef struct AVFrameSideData { |