diff options
| author | Clément Bœsch <cboesch@gopro.com> | 2017-03-31 09:46:51 +0200 |
|---|---|---|
| committer | Clément Bœsch <cboesch@gopro.com> | 2017-03-31 09:46:51 +0200 |
| commit | 82ad9cbd32c873bced9adf4a2bb67dcda7294c61 (patch) | |
| tree | d0e5060083ecacf967ff24be7bcad46e58e1a82f /libavutil/pixfmt.h | |
| parent | 1ea0df14c367d7c6584b4bcbc2aaae5acc685634 (diff) | |
| parent | 17dac56b8fdd80c594c39b76de3f27a7949afbde (diff) | |
Merge commit '17dac56b8fdd80c594c39b76de3f27a7949afbde'
* commit '17dac56b8fdd80c594c39b76de3f27a7949afbde':
lavu: Rename ycgco color space appropriately
Merged-by: Clément Bœsch <cboesch@gopro.com>
Diffstat (limited to 'libavutil/pixfmt.h')
| -rw-r--r-- | libavutil/pixfmt.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index d41d1ca12f..5dafc341a1 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -457,7 +457,8 @@ enum AVColorSpace { 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 AVCOL_SPC_SMPTE240M = 7, ///< functionally identical to above - AVCOL_SPC_YCOCG = 8, ///< Used by Dirac / VC-2 and H.264 FRext, see ITU-T SG16 + AVCOL_SPC_YCGCO = 8, ///< Used by Dirac / VC-2 and H.264 FRext, see ITU-T SG16 + AVCOL_SPC_YCOCG = AVCOL_SPC_YCGCO, AVCOL_SPC_BT2020_NCL = 9, ///< ITU-R BT2020 non-constant luminance system AVCOL_SPC_BT2020_CL = 10, ///< ITU-R BT2020 constant luminance system AVCOL_SPC_SMPTE2085 = 11, ///< SMPTE 2085, Y'D'zD'x |