eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-06 22:25:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'bddd8cbf68551f6405b2bf77cc3e212af9fbe834'

Browse Source 
* commit 'bddd8cbf68551f6405b2bf77cc3e212af9fbe834':
  Add transformation matrix API.

Conflicts:
	libavcodec/avcodec.h
	libavcodec/utils.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-05-19 19:12:30 +02:00
parent af72f62d7b bddd8cbf68
commit ef1d4ee2f8
9 changed files with 180 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/avcodec.h
View File

@@ -1052,6 +1052,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