diff options
| author | James Almer <jamrial@gmail.com> | 2016-09-28 13:12:18 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2016-09-28 13:12:18 -0300 |
| commit | 6e76c9c45018b9cea383ff1c3f17d08792623509 (patch) | |
| tree | bcfdbc8086bde9c940976a6144fb9737b31c09ef /libavutil | |
| parent | f013ba475b0dbf71e2804c57e67bf308ae636f2b (diff) | |
| parent | a8164323374e86ce5f93759230868c98356833a2 (diff) | |
Merge commit 'a8164323374e86ce5f93759230868c98356833a2'
* commit 'a8164323374e86ce5f93759230868c98356833a2':
pixdesc: Add new SMPTE 431, 432, and 2085 color properties
Conflicts:
libavcodec/options_table.h
libavcodec/version.h
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/pixdesc.c | 3 | ||||
| -rw-r--r-- | libavutil/pixfmt.h | 5 | ||||
| -rw-r--r-- | libavutil/version.h | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index a147a2d3fb..b715fce15d 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -2115,6 +2115,8 @@ static const char *color_primaries_names[AVCOL_PRI_NB] = { [AVCOL_PRI_FILM] = "film", [AVCOL_PRI_BT2020] = "bt2020", [AVCOL_PRI_SMPTEST428_1] = "smpte428-1", + [AVCOL_PRI_SMPTE431] = "smpte431", + [AVCOL_PRI_SMPTE432] = "smpte432", }; static const char *color_transfer_names[] = { @@ -2151,6 +2153,7 @@ static const char *color_space_names[] = { [AVCOL_SPC_YCOCG] = "ycgco", [AVCOL_SPC_BT2020_NCL] = "bt2020nc", [AVCOL_SPC_BT2020_CL] = "bt2020c", + [AVCOL_SPC_SMPTE2085] = "smpte2085", }; static const char *chroma_location_names[] = { diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 6f71ac0483..6511f18a62 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -400,7 +400,9 @@ enum AVColorPrimaries { AVCOL_PRI_SMPTE240M = 7, ///< functionally identical to above AVCOL_PRI_FILM = 8, ///< colour filters using Illuminant C AVCOL_PRI_BT2020 = 9, ///< ITU-R BT2020 - AVCOL_PRI_SMPTEST428_1= 10, ///< SMPTE ST 428-1 (CIE 1931 XYZ) + AVCOL_PRI_SMPTEST428_1 = 10, ///< SMPTE ST 428-1 (CIE 1931 XYZ) + AVCOL_PRI_SMPTE431 = 11, ///< SMPTE ST 431-2 (2011) + AVCOL_PRI_SMPTE432 = 12, ///< SMPTE ST 432-1 D65 (2010) AVCOL_PRI_NB, ///< Not part of ABI }; @@ -445,6 +447,7 @@ enum AVColorSpace { 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 + AVCOL_SPC_SMPTE2085 = 11, ///< SMPTE 2085, Y'D'zD'x AVCOL_SPC_NB, ///< Not part of ABI }; #define AVCOL_SPC_YCGCO AVCOL_SPC_YCOCG diff --git a/libavutil/version.h b/libavutil/version.h index 60b58ebd3e..42adf4fdbd 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 55 -#define LIBAVUTIL_VERSION_MINOR 30 +#define LIBAVUTIL_VERSION_MINOR 31 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |