diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-14 21:13:46 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-17 03:15:31 +0400 |
commit | a80e622924c89df69fb1c225ba432fe12fe6648e (patch) | |
tree | d2d8f5a4cc4792bc0f6bb8dfd772091a5ed7a192 /libavcodec/avcodec.h | |
parent | 0092bcdf06f240deed890c0d29a95b86f82fe2ee (diff) |
avcodec/avutil: Add AVColorSpace and AVColorRange to AVFrames
This also moves AVColorSpace and AVColorRange from avcodec to avutil
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r-- | libavcodec/avcodec.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 4b462fa5f8..fca8a8f67b 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -627,26 +627,6 @@ enum AVColorTransferCharacteristic{ AVCOL_TRC_NB , ///< Not part of ABI }; -enum AVColorSpace{ - AVCOL_SPC_RGB = 0, - AVCOL_SPC_BT709 = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 / SMPTE RP177 Annex B - AVCOL_SPC_UNSPECIFIED = 2, - AVCOL_SPC_FCC = 4, - AVCOL_SPC_BT470BG = 5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM / IEC 61966-2-4 xvYCC601 - AVCOL_SPC_SMPTE170M = 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC / functionally identical to above - AVCOL_SPC_SMPTE240M = 7, - AVCOL_SPC_YCOCG = 8, ///< Used by Dirac / VC-2 and H.264 FRext, see ITU-T SG16 - AVCOL_SPC_NB , ///< Not part of ABI -}; -#define AVCOL_SPC_YCGCO AVCOL_SPC_YCOCG - -enum AVColorRange{ - AVCOL_RANGE_UNSPECIFIED = 0, - AVCOL_RANGE_MPEG = 1, ///< the normal 219*2^(n-8) "MPEG" YUV ranges - AVCOL_RANGE_JPEG = 2, ///< the normal 2^n-1 "JPEG" YUV ranges - AVCOL_RANGE_NB , ///< Not part of ABI -}; - /** * X X 3 4 X X are luma samples, * 1 2 1-6 are possible chroma positions |