diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-12 16:17:08 +0300 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-12 16:17:13 +0300 |
| commit | 92d934106cb299139df9327d0d0dd53cd427e73c (patch) | |
| tree | 70ed36abb4e5c93c78851e499d09c4a5ef90a908 /libavutil/pixfmt.h | |
| parent | 9f8a942d6ac9c953664341d5bc37b41c1fbab48b (diff) | |
| parent | 785bfb1d7bb8de567c3aac1d9cc369b55ac9fb7b (diff) | |
Merge commit '785bfb1d7bb8de567c3aac1d9cc369b55ac9fb7b'
* commit '785bfb1d7bb8de567c3aac1d9cc369b55ac9fb7b':
pixfmt: fix wrong comment
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavutil/pixfmt.h')
| -rw-r--r-- | libavutil/pixfmt.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 546eb44440..41e910685f 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -433,8 +433,8 @@ enum AVColorSpace { AVCOL_SPC_RESERVED = 3, 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, + 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_BT2020_NCL = 9, ///< ITU-R BT2020 non-constant luminance system AVCOL_SPC_BT2020_CL = 10, ///< ITU-R BT2020 constant luminance system |