virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-14 00:58:38 +02:00
Code Issues Releases Activity

Merge commit 'ff23c4e4935e96e62d8ff2212a1955a43add88e1'

Browse Source 
* commit 'ff23c4e4935e96e62d8ff2212a1955a43add88e1':
  doxy: Add AVFrame to the structured modules

Conflicts:
	libavutil/frame.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-01-17 14:45:11 +01:00
commit 68ebf70f66
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavutil/frame.h
View File

@ -17,6 +17,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
/**
* @file
* @ingroup lavu_frame
* reference-counted frame API
*/
#ifndef AVUTIL_FRAME_H #ifndef AVUTIL_FRAME_H
#define AVUTIL_FRAME_H #define AVUTIL_FRAME_H
@ -29,6 +35,7 @@
#include "samplefmt.h" #include "samplefmt.h"
#include "version.h" #include "version.h"
enum AVColorSpace{ enum AVColorSpace{
AVCOL_SPC_RGB = 0, AVCOL_SPC_RGB = 0,
AVCOL_SPC_BT709 = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 / SMPTE RP177 Annex B AVCOL_SPC_BT709 = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 / SMPTE RP177 Annex B
@ -52,6 +59,14 @@ enum AVColorRange{
}; };
/**
* @defgroup lavu_frame AVFrame
* @ingroup lavu_data
*
* @{
* AVFrame is an abstraction for reference-counted raw multimedia data.
*/
enum AVFrameSideDataType { enum AVFrameSideDataType {
/** /**
* The data is the AVPanScan struct defined in libavcodec. * The data is the AVPanScan struct defined in libavcodec.
@ -683,4 +698,8 @@ AVFrameSideData *av_frame_new_side_data(AVFrame *frame,
AVFrameSideData *av_frame_get_side_data(const AVFrame *frame, AVFrameSideData *av_frame_get_side_data(const AVFrame *frame,
enum AVFrameSideDataType type); enum AVFrameSideDataType type);
/**
* @}
*/
#endif /* AVUTIL_FRAME_H */ #endif /* AVUTIL_FRAME_H */