avutil/pixfmt: Add EBU Tech. 3213-E AVColorPrimaries value

This is an alias for JEDEC P22.

The name associated with the value is also changed
from jedec-p22 to ebu3213 to match ITU-T H.273.

Signed-off-by: Raphaël Zumer <rzumer@tebako.net>
Signed-off-by: James Almer <jamrial@gmail.com>

diff --git a/doc/APIchanges b/doc/APIchanges
index 682b67aa25fe2b2380a5ced2b9a12483fa9a843f..82f38987d6e3c0ea4c4f82c05b06b587d246f184 100644 (file)
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -15,6 +15,9 @@ libavutil:     2017-10-21
 
 API changes, most recent first:
 
+2019-09-01 - xxxxxxxxxx - lavu 56.34.100 - pixfmt.h
+  Add EBU Tech. 3213-E AVColorPrimaries value
+
 2019-08-xx - xxxxxxxxxx - lavf 58.31.101 - avio.h
   4K limit removed from avio_printf.
 

diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c
index b97b0665b0a3aa0f354576b50c90f85cf30887aa..05dd4a1e20d8a8cc8e27f24c145300c0180d7e9c 100644 (file)
--- a/libavutil/pixdesc.c
+++ b/libavutil/pixdesc.c
@@ -2369,7 +2369,7 @@ static const char * const color_primaries_names[AVCOL_PRI_NB] = {
     [AVCOL_PRI_SMPTE428] = "smpte428",
     [AVCOL_PRI_SMPTE431] = "smpte431",
     [AVCOL_PRI_SMPTE432] = "smpte432",
-    [AVCOL_PRI_JEDEC_P22] = "jedec-p22",
+    [AVCOL_PRI_EBU3213] = "ebu3213",
 };
 
 static const char * const color_transfer_names[] = {

diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h
index 8b54c9415bbe9ebf874f9c9516befe0229e2f1d7..d78e863d4bc03cc4413c1064c4591f4cef93dfca 100644 (file)
--- a/libavutil/pixfmt.h
+++ b/libavutil/pixfmt.h
@@ -456,7 +456,8 @@ 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_EBU3213     = 22, ///< EBU Tech. 3213-E / JEDEC P22 phosphors
+    AVCOL_PRI_JEDEC_P22   = AVCOL_PRI_EBU3213,
     AVCOL_PRI_NB                ///< Not part of ABI
 };
 

diff --git a/libavutil/version.h b/libavutil/version.h
index ecc6a7c9e2ac3bf3e3e18cbec9960fa097d6242d..658a5082848de8dbdba11dccf1ac3621b91d2148 100644 (file)
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -79,7 +79,7 @@
  */
 
 #define LIBAVUTIL_VERSION_MAJOR  56
-#define LIBAVUTIL_VERSION_MINOR  33
+#define LIBAVUTIL_VERSION_MINOR  34
 #define LIBAVUTIL_VERSION_MICRO 100
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \