generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'c98f3169bfb578c1a4e407b44524f0bfa3b4dc0c'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2014-02-16 02:05:29 +01:00
parent fdf8b59b28 c98f3169bf
commit a2bc6c116d
6 changed files with 165 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavutil/frame.h
View File

@@ -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 {