diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-17 14:45:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-17 14:55:08 +0100 |
| commit | 68ebf70f665bee7a55e99013eec51963429b8f4e (patch) | |
| tree | 967a7285e8e46ebf127a8820cb1a93eb84380325 /libavutil | |
| parent | c8b99f8ad0589bf1bf5f107f44eb4b207bf6c431 (diff) | |
| parent | ff23c4e4935e96e62d8ff2212a1955a43add88e1 (diff) | |
| download | ffmpeg-68ebf70f665bee7a55e99013eec51963429b8f4e.tar.gz | |
Merge commit 'ff23c4e4935e96e62d8ff2212a1955a43add88e1'
* commit 'ff23c4e4935e96e62d8ff2212a1955a43add88e1':
doxy: Add AVFrame to the structured modules
Conflicts:
libavutil/frame.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/frame.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/libavutil/frame.h b/libavutil/frame.h index 5e113fabb5..2bcbd7ec80 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -17,6 +17,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +/** + * @file + * @ingroup lavu_frame + * reference-counted frame API + */ + #ifndef AVUTIL_FRAME_H #define AVUTIL_FRAME_H @@ -29,6 +35,7 @@ #include "samplefmt.h" #include "version.h" + enum AVColorSpace{ AVCOL_SPC_RGB = 0, 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 { /** * 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, enum AVFrameSideDataType type); +/** + * @} + */ + #endif /* AVUTIL_FRAME_H */ |