summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaphaël Zumer <rzumer@tebako.net>2019-08-11 09:54:56 -0400
committerJames Almer <jamrial@gmail.com>2019-09-01 19:56:05 -0300
commit8821d1f56e189db54ae3c58410a124464acdeb7c (patch)
tree450a3a3a713904eed1c699aa223a163daf7d3b5c
parentcc78783ce5e8837d4f4ca43eedf2d299651e65ff (diff)
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>
-rw-r--r--doc/APIchanges3
-rw-r--r--libavutil/pixdesc.c2
-rw-r--r--libavutil/pixfmt.h3
-rw-r--r--libavutil/version.h2
4 files changed, 7 insertions, 3 deletions
diff --git a/doc/APIchanges b/doc/APIchanges
index 682b67aa25..82f38987d6 100644
--- 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 b97b0665b0..05dd4a1e20 100644
--- 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 8b54c9415b..d78e863d4b 100644
--- 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 ecc6a7c9e2..658a508284 100644
--- 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, \