diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2016-10-31 14:50:59 -0400 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2016-11-08 11:22:29 -0500 |
| commit | 17dac56b8fdd80c594c39b76de3f27a7949afbde (patch) | |
| tree | e83bb47011c86d60d1e2cbdbd9b3a0f81160a219 /libavutil | |
| parent | 0361e4dcb4d394c88c33364415a3b8fe315b67d1 (diff) | |
| download | ffmpeg-17dac56b8fdd80c594c39b76de3f27a7949afbde.tar.gz | |
lavu: Rename ycgco color space appropriately
Planes are ordered as the name suggests now.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/pixdesc.c | 2 | ||||
| -rw-r--r-- | libavutil/pixfmt.h | 3 | ||||
| -rw-r--r-- | libavutil/version.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index db90229ebc..2f1adf5d8d 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -1818,7 +1818,7 @@ static const char *color_space_names[] = { [AVCOL_SPC_BT470BG] = "bt470bg", [AVCOL_SPC_SMPTE170M] = "smpte170m", [AVCOL_SPC_SMPTE240M] = "smpte240m", - [AVCOL_SPC_YCOCG] = "ycgco", + [AVCOL_SPC_YCGCO] = "ycgco", [AVCOL_SPC_BT2020_NCL] = "bt2020nc", [AVCOL_SPC_BT2020_CL] = "bt2020c", [AVCOL_SPC_SMPTE2085] = "smpte2085", diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 5a7b78a6aa..2a0c85e269 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -374,7 +374,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 diff --git a/libavutil/version.h b/libavutil/version.h index 95aea2f678..f1102312ba 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -54,7 +54,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 55 -#define LIBAVUTIL_VERSION_MINOR 28 +#define LIBAVUTIL_VERSION_MINOR 29 #define LIBAVUTIL_VERSION_MICRO 0 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |