Merge commit '5b4797a21db900b7d509660b7a4d49829089b004'

* commit '5b4797a21db900b7d509660b7a4d49829089b004': avframe: add AV_FRAME_DATA_MATRIXENCODING side data type. Conflicts: libavutil/version.h

Michael Niedermayer committed 12 years ago

Commit 4cf4da92 parents 751385f 5b4797a5 files · +36 −1Browse files

Showing the changes to doc/APIchanges (1 of 5 files). Show all

Unified · Split

@@ -15,6 +15,10 @@ libavutil: 2012-10-22 · 14 unmodified lines
15		15
16	API changes, most recent first:	16	API changes, most recent first:
17		17
		18	2013-12-xx - xxxxxxx - lavu 53.2.0 - frame.h
		19	Add AV_FRAME_DATA_MATRIXENCODING value to the AVFrameSideDataType enum, which
		20	identifies AVMatrixEncoding data.
		21
18	2013-12-xx - xxxxxxx - lavu 53.1.0 - channel_layout.h	22	2013-12-xx - xxxxxxx - lavu 53.1.0 - channel_layout.h
19	Add values for various Dolby flags to the AVMatrixEncoding enum.	23	Add values for various Dolby flags to the AVMatrixEncoding enum.
20		24

Keyboard shortcuts