diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-08 22:28:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-08 22:28:45 +0200 |
| commit | 1b6172dcf619156b777fc29ae82e90fd42328fc0 (patch) | |
| tree | 8ef33639106a8d70f48a35ac02789729a8cef5ed | |
| parent | dc5560efda8e956b20bed2cb955f060733bc3200 (diff) | |
| parent | c732c62cee43f651775af5547cff99d418248542 (diff) | |
| download | ffmpeg-1b6172dcf619156b777fc29ae82e90fd42328fc0.tar.gz | |
Merge commit 'c732c62cee43f651775af5547cff99d418248542'
* commit 'c732c62cee43f651775af5547cff99d418248542':
doc: expand description for some color properties
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavutil/pixfmt.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index a76a852cda..61fe6a0d64 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -436,11 +436,12 @@ enum AVColorPrimaries { AVCOL_PRI_BT709 = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 / SMPTE RP177 Annex B AVCOL_PRI_UNSPECIFIED = 2, AVCOL_PRI_RESERVED = 3, - AVCOL_PRI_BT470M = 4, + AVCOL_PRI_BT470M = 4, ///< also FCC Title 47 Code of Federal Regulations 73.682 (a)(20) + AVCOL_PRI_BT470BG = 5, ///< also ITU-R BT601-6 625 / ITU-R BT1358 625 / ITU-R BT1700 625 PAL & SECAM AVCOL_PRI_SMPTE170M = 6, ///< also ITU-R BT601-6 525 / ITU-R BT1358 525 / ITU-R BT1700 NTSC AVCOL_PRI_SMPTE240M = 7, ///< functionally identical to above - AVCOL_PRI_FILM = 8, + AVCOL_PRI_FILM = 8, ///< colour filters using Illuminant C AVCOL_PRI_BT2020 = 9, ///< ITU-R BT2020 AVCOL_PRI_NB, ///< Not part of ABI }; @@ -471,11 +472,11 @@ enum AVColorTransferCharacteristic { * YUV colorspace type. */ enum AVColorSpace { - AVCOL_SPC_RGB = 0, + AVCOL_SPC_RGB = 0, ///< order of coefficients is actually GBR, also IEC 61966-2-1 (sRGB) AVCOL_SPC_BT709 = 1, ///< also ITU-R BT1361 / IEC 61966-2-4 xvYCC709 / SMPTE RP177 Annex B AVCOL_SPC_UNSPECIFIED = 2, AVCOL_SPC_RESERVED = 3, - AVCOL_SPC_FCC = 4, + AVCOL_SPC_FCC = 4, ///< FCC Title 47 Code of Federal Regulations 73.682 (a)(20) 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, |