From 0d9b9bd37f43ee29ad9f709d85c8f3be9db71104 Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Tue, 18 Oct 2016 18:16:29 -0400 Subject: lavu: Add JEDEC P22 color primaries --- libavutil/pixdesc.c | 1 + libavutil/pixfmt.h | 1 + libavutil/version.h | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) (limited to 'libavutil') diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 80bdee74d0..7987f292ac 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -1763,6 +1763,7 @@ static const char *color_primaries_names[] = { [AVCOL_PRI_SMPTE428] = "smpte428", [AVCOL_PRI_SMPTE431] = "smpte431", [AVCOL_PRI_SMPTE432] = "smpte432", + [AVCOL_PRI_JEDEC_P22] = "jedec-p22", }; static const char *color_transfer_names[] = { diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 917fa579c8..0bee724998 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -326,6 +326,7 @@ enum AVColorPrimaries { AVCOL_PRI_SMPTEST428_1 = AVCOL_PRI_SMPTE428, AVCOL_PRI_SMPTE431 = 11, ///< SMPTE ST 431-2 (2011) / DCI P3 AVCOL_PRI_SMPTE432 = 12, ///< SMPTE ST 432-1 (2010) / P3 D65 / Display P3 + AVCOL_PRI_JEDEC_P22 = 22, ///< JEDEC P22 phosphors AVCOL_PRI_NB, ///< Not part of ABI }; diff --git a/libavutil/version.h b/libavutil/version.h index 77288f58a6..c1cfcbba2f 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -54,7 +54,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 55 -#define LIBAVUTIL_VERSION_MINOR 25 +#define LIBAVUTIL_VERSION_MINOR 26 #define LIBAVUTIL_VERSION_MICRO 0 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ -- cgit v1.2.3