[FFmpeg-devel] [PATCH 3/3] avcodec: Support EBU Tech. 3213-E primaries values
From: Raphaël Zumer
Signed-off-by: Raphaël Zumer
---
libavcodec/options_table.h | 1 +
libavcodec/version.h | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index 4a266eca16..c3a500a629 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -366,6 +366,7 @@ static const AVOption avcodec_options[] = {
{"smpte431","SMPTE 431-2",0, AV_OPT_TYPE_CONST, {.i64 =
AVCOL_PRI_SMPTE431 }, INT_MIN, INT_MAX, V|E|D, "color_primaries_type"},
{"smpte432","SMPTE 422-1",0, AV_OPT_TYPE_CONST, {.i64 =
AVCOL_PRI_SMPTE432 }, INT_MIN, INT_MAX, V|E|D, "color_primaries_type"},
{"jedec-p22", "JEDEC P22", 0, AV_OPT_TYPE_CONST, {.i64 =
AVCOL_PRI_JEDEC_P22 },INT_MIN, INT_MAX, V|E|D, "color_primaries_type"},
+{"ebu3213", "EBU 3213-E", 0, AV_OPT_TYPE_CONST, {.i64 =
AVCOL_PRI_EBU3213 }, INT_MIN, INT_MAX, V|E|D, "color_primaries_type"},
{"unspecified", "Unspecified",0, AV_OPT_TYPE_CONST, {.i64 =
AVCOL_PRI_UNSPECIFIED }, INT_MIN, INT_MAX, V|E|D, "color_primaries_type"},
{"color_trc", "color transfer characteristics", OFFSET(color_trc),
AV_OPT_TYPE_INT, {.i64 = AVCOL_TRC_UNSPECIFIED }, 1, INT_MAX, V|E|D,
"color_trc_type"},
{"bt709","BT.709", 0, AV_OPT_TYPE_CONST, {.i64 =
AVCOL_TRC_BT709 },INT_MIN, INT_MAX, V|E|D, "color_trc_type"},
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 43c8cdb59f..e70ebc0c70 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -29,7 +29,7 @@
#define LIBAVCODEC_VERSION_MAJOR 58
#define LIBAVCODEC_VERSION_MINOR 55
-#define LIBAVCODEC_VERSION_MICRO 100
+#define LIBAVCODEC_VERSION_MICRO 101
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
--
2.17.1
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-devel] [PATCH 1/3] avutil/pixfmt: Add EBU Tech. 3213-E AVColorPrimaries value
From: Raphaël Zumer
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
---
doc/APIchanges | 3 +++
libavutil/pixdesc.c | 2 +-
libavutil/pixfmt.h | 3 ++-
libavutil/version.h | 2 +-
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/doc/APIchanges b/doc/APIchanges
index 6603a8229e..f71b0c4a75 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -15,6 +15,9 @@ libavutil: 2017-10-21
API changes, most recent first:
+2019-08-08 - xx - lavu 56.34.100 - pixfmt.h
+ Add EBU Tech. 3213-E AVColorPrimaries value
+
2019-07-27 - xx - lavu 56.33.100 - tx.h
Add AV_TX_DOUBLE_FFT and AV_TX_DOUBLE_MDCT
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, \
--
2.17.1
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-devel] [PATCH 2/3] avfilter: Support EBU Tech. 3213-E primaries values
From: Raphaël Zumer
Signed-off-by: Raphaël Zumer
---
libavfilter/version.h | 2 +-
libavfilter/vf_colorspace.c | 1 +
libavfilter/vf_setparams.c | 1 +
libavfilter/vf_zscale.c | 1 +
4 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/libavfilter/version.h b/libavfilter/version.h
index dd829160fc..58a0221f43 100644
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
@@ -31,7 +31,7 @@
#define LIBAVFILTER_VERSION_MAJOR 7
#define LIBAVFILTER_VERSION_MINOR 58
-#define LIBAVFILTER_VERSION_MICRO 100
+#define LIBAVFILTER_VERSION_MICRO 101
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
diff --git a/libavfilter/vf_colorspace.c b/libavfilter/vf_colorspace.c
index df6efffb3d..f414209ea2 100644
--- a/libavfilter/vf_colorspace.c
+++ b/libavfilter/vf_colorspace.c
@@ -969,6 +969,7 @@ static const AVOption colorspace_options[] = {
ENUM("smpte432", AVCOL_PRI_SMPTE432, "prm"),
ENUM("bt2020", AVCOL_PRI_BT2020, "prm"),
ENUM("jedec-p22",AVCOL_PRI_JEDEC_P22, "prm"),
+ENUM("ebu3213", AVCOL_PRI_EBU3213,"prm"),
{ "trc","Output transfer characteristics",
OFFSET(user_trc), AV_OPT_TYPE_INT, { .i64 = AVCOL_TRC_UNSPECIFIED },
diff --git a/libavfilter/vf_setparams.c b/libavfilter/vf_setparams.c
index fe298e5a06..689097fac0 100644
--- a/libavfilter/vf_setparams.c
+++ b/libavfilter/vf_setparams.c
@@ -75,6 +75,7 @@ static const AVOption setparams_options[] = {
{"smpte431",NULL, 0, AV_OPT_TYPE_CONST,
{.i64=AVCOL_PRI_SMPTE431}, INT_MIN, INT_MAX, FLAGS, "color_primaries"},
{"smpte432",NULL, 0, AV_OPT_TYPE_CONST,
{.i64=AVCOL_PRI_SMPTE432}, INT_MIN, INT_MAX, FLAGS, "color_primaries"},
{"jedec-p22", NULL, 0, AV_OPT_TYPE_CONST,
{.i64=AVCOL_PRI_JEDEC_P22},INT_MIN, INT_MAX, FLAGS, "color_primaries"},
+{"ebu3213", NULL, 0, AV_OPT_TYPE_CONST,
{.i64=AVCOL_PRI_EBU3213}, INT_MIN, INT_MAX, FLAGS, "color_primaries"},
{"color_trc", "select color transfer", OFFSET(color_trc), AV_OPT_TYPE_INT,
{.i64=-1}, -1, AVCOL_TRC_NB-1, FLAGS, "color_trc"},
{"auto", "keep the same color transfer", 0, AV_OPT_TYPE_CONST, {.i64=-1},
INT_MIN, INT_MAX, FLAGS, "color_trc"},
diff --git a/libavfilter/vf_zscale.c b/libavfilter/vf_zscale.c
index f0309272fa..9b0d08625f 100644
--- a/libavfilter/vf_zscale.c
+++ b/libavfilter/vf_zscale.c
@@ -789,6 +789,7 @@ static const AVOption zscale_options[] = {
{ "smpte431", 0, 0, AV_OPT_TYPE_CONST,
{.i64 = ZIMG_PRIMARIES_ST431_2}, 0, 0, FLAGS, "primaries" },
{ "smpte432", 0, 0, AV_OPT_TYPE_CONST,
{.i64 = ZIMG_PRIMARIES_ST432_1}, 0, 0, FLAGS, "primaries" },
{ "jedec-p22",0, 0, AV_OPT_TYPE_CONST,
{.i64 = ZIMG_PRIMARIES_EBU3213_E}, 0, 0, FLAGS, "primaries" },
+{ "ebu3213", 0, 0, AV_OPT_TYPE_CONST,
{.i64 = ZIMG_PRIMARIES_EBU3213_E}, 0, 0, FLAGS, "primaries" },
{ "transfer", "set transfer characteristic", OFFSET(trc), AV_OPT_TYPE_INT,
{.i64 = -1}, -1, INT_MAX, FLAGS, "transfer" },
{ "t","set transfer characteristic", OFFSET(trc), AV_OPT_TYPE_INT,
{.i64 = -1}, -1, INT_MAX, FLAGS, "transfer" },
{ "input",0, 0, AV_OPT_TYPE_CONST,
{.i64 = -1}, 0, 0, FLAGS, "transfer" },
--
2.17.1
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-devel] [PATCH 3/3] avcodec: Rename jedec-p22 to ebu3213
From: Raphaël Zumer
This matches a name change in avutil/pixdesc.
Signed-off-by: Raphaël Zumer
---
libavcodec/options_table.h | 2 +-
libavcodec/version.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index 4a266eca16..9d82188171 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -365,7 +365,7 @@ static const AVOption avcodec_options[] = {
{"smpte428_1", "SMPTE 428-1",0, AV_OPT_TYPE_CONST, {.i64 =
AVCOL_PRI_SMPTE428 }, INT_MIN, INT_MAX, V|E|D, "color_primaries_type"},
{"smpte431","SMPTE 431-2",0, AV_OPT_TYPE_CONST, {.i64 =
AVCOL_PRI_SMPTE431 }, INT_MIN, INT_MAX, V|E|D, "color_primaries_type"},
{"smpte432","SMPTE 422-1",0, AV_OPT_TYPE_CONST, {.i64 =
AVCOL_PRI_SMPTE432 }, INT_MIN, INT_MAX, V|E|D, "color_primaries_type"},
-{"jedec-p22", "JEDEC P22", 0, AV_OPT_TYPE_CONST, {.i64 =
AVCOL_PRI_JEDEC_P22 },INT_MIN, INT_MAX, V|E|D, "color_primaries_type"},
+{"ebu3213", "EBU 3213-E", 0, AV_OPT_TYPE_CONST, {.i64 =
AVCOL_PRI_JEDEC_P22 },INT_MIN, INT_MAX, V|E|D, "color_primaries_type"},
{"unspecified", "Unspecified",0, AV_OPT_TYPE_CONST, {.i64 =
AVCOL_PRI_UNSPECIFIED }, INT_MIN, INT_MAX, V|E|D, "color_primaries_type"},
{"color_trc", "color transfer characteristics", OFFSET(color_trc),
AV_OPT_TYPE_INT, {.i64 = AVCOL_TRC_UNSPECIFIED }, 1, INT_MAX, V|E|D,
"color_trc_type"},
{"bt709","BT.709", 0, AV_OPT_TYPE_CONST, {.i64 =
AVCOL_TRC_BT709 },INT_MIN, INT_MAX, V|E|D, "color_trc_type"},
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 43c8cdb59f..e70ebc0c70 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -29,7 +29,7 @@
#define LIBAVCODEC_VERSION_MAJOR 58
#define LIBAVCODEC_VERSION_MINOR 55
-#define LIBAVCODEC_VERSION_MICRO 100
+#define LIBAVCODEC_VERSION_MICRO 101
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
--
2.17.1
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-devel] [PATCH 2/3] avfilter: Rename jedec-p22 to ebu3213
From: Raphaël Zumer
This matches a name change in avutil/pixdesc.
Signed-off-by: Raphaël Zumer
---
libavfilter/version.h | 2 +-
libavfilter/vf_colorspace.c | 2 +-
libavfilter/vf_setparams.c | 2 +-
libavfilter/vf_zscale.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/libavfilter/version.h b/libavfilter/version.h
index dd829160fc..58a0221f43 100644
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
@@ -31,7 +31,7 @@
#define LIBAVFILTER_VERSION_MAJOR 7
#define LIBAVFILTER_VERSION_MINOR 58
-#define LIBAVFILTER_VERSION_MICRO 100
+#define LIBAVFILTER_VERSION_MICRO 101
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
diff --git a/libavfilter/vf_colorspace.c b/libavfilter/vf_colorspace.c
index df6efffb3d..5f22f92507 100644
--- a/libavfilter/vf_colorspace.c
+++ b/libavfilter/vf_colorspace.c
@@ -968,7 +968,7 @@ static const AVOption colorspace_options[] = {
ENUM("smpte431", AVCOL_PRI_SMPTE431, "prm"),
ENUM("smpte432", AVCOL_PRI_SMPTE432, "prm"),
ENUM("bt2020", AVCOL_PRI_BT2020, "prm"),
-ENUM("jedec-p22",AVCOL_PRI_JEDEC_P22, "prm"),
+ENUM("ebu3213", AVCOL_PRI_JEDEC_P22, "prm"),
{ "trc","Output transfer characteristics",
OFFSET(user_trc), AV_OPT_TYPE_INT, { .i64 = AVCOL_TRC_UNSPECIFIED },
diff --git a/libavfilter/vf_setparams.c b/libavfilter/vf_setparams.c
index fe298e5a06..80e61f851e 100644
--- a/libavfilter/vf_setparams.c
+++ b/libavfilter/vf_setparams.c
@@ -74,7 +74,7 @@ static const AVOption setparams_options[] = {
{"smpte428",NULL, 0, AV_OPT_TYPE_CONST,
{.i64=AVCOL_PRI_SMPTE428}, INT_MIN, INT_MAX, FLAGS, "color_primaries"},
{"smpte431",NULL, 0, AV_OPT_TYPE_CONST,
{.i64=AVCOL_PRI_SMPTE431}, INT_MIN, INT_MAX, FLAGS, "color_primaries"},
{"smpte432",NULL, 0, AV_OPT_TYPE_CONST,
{.i64=AVCOL_PRI_SMPTE432}, INT_MIN, INT_MAX, FLAGS, "color_primaries"},
-{"jedec-p22", NULL, 0, AV_OPT_TYPE_CONST,
{.i64=AVCOL_PRI_JEDEC_P22},INT_MIN, INT_MAX, FLAGS, "color_primaries"},
+{"ebu3213", NULL, 0, AV_OPT_TYPE_CONST,
{.i64=AVCOL_PRI_JEDEC_P22},INT_MIN, INT_MAX, FLAGS, "color_primaries"},
{"color_trc", "select color transfer", OFFSET(color_trc), AV_OPT_TYPE_INT,
{.i64=-1}, -1, AVCOL_TRC_NB-1, FLAGS, "color_trc"},
{"auto", "keep the same color transfer", 0, AV_OPT_TYPE_CONST, {.i64=-1},
INT_MIN, INT_MAX, FLAGS, "color_trc"},
diff --git a/libavfilter/vf_zscale.c b/libavfilter/vf_zscale.c
index f0309272fa..e53d7c1ae0 100644
--- a/libavfilter/vf_zscale.c
+++ b/libavfilter/vf_zscale.c
@@ -788,7 +788,7 @@ static const AVOption zscale_options[] = {
{ "smpte428", 0, 0, AV_OPT_TYPE_CONST,
{.i64 = ZIMG_PRIMARIES_ST428}, 0, 0, FLAGS, "primaries" },
{ "smpte431", 0, 0, AV_OPT_TYPE_CONST,
{.i64 = ZIMG_PRIMARIES_ST431_2}, 0, 0, FLAGS, "primaries" },
{ "smpte432", 0, 0, AV_OPT_TYPE_CONST,
{.i64 = ZIMG_PRIMARIES_ST432_1}, 0, 0, FLAGS, "primaries" },
-{ "jedec-p22",0, 0, AV_OPT_TYPE_CONST,
{.i64 = ZIMG_PRIMARIES_EBU3213_E}, 0, 0, FLAGS, "primaries" },
+{ "ebu3213", 0, 0, AV_OPT_TYPE_CONST,
{.i64 = ZIMG_PRIMARIES_EBU3213_E}, 0, 0, FLAGS, "primaries" },
{ "transfer", "set transfer characteristic", OFFSET(trc), AV_OPT_TYPE_INT,
{.i64 = -1}, -1, INT_MAX, FLAGS, "transfer" },
{ "t","set transfer characteristic", OFFSET(trc), AV_OPT_TYPE_INT,
{.i64 = -1}, -1, INT_MAX, FLAGS, "transfer" },
{ "input",0, 0, AV_OPT_TYPE_CONST,
{.i64 = -1}, 0, 0, FLAGS, "transfer" },
--
2.17.1
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-devel] [PATCH 1/3] avutil/pixfmt: Add EBU Tech. 3213-E AVColorPrimaries value
From: Raphaël Zumer
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
---
doc/APIchanges | 3 +++
libavutil/pixdesc.c | 2 +-
libavutil/pixfmt.h | 1 +
libavutil/version.h | 2 +-
4 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/doc/APIchanges b/doc/APIchanges
index 6603a8229e..f71b0c4a75 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -15,6 +15,9 @@ libavutil: 2017-10-21
API changes, most recent first:
+2019-08-08 - xx - lavu 56.34.100 - pixfmt.h
+ Add EBU Tech. 3213-E AVColorPrimaries value
+
2019-07-27 - xx - lavu 56.33.100 - tx.h
Add AV_TX_DOUBLE_FFT and AV_TX_DOUBLE_MDCT
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c
index b97b0665b0..3b2d3b3123 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_JEDEC_P22] = "ebu3213",
};
static const char * const color_transfer_names[] = {
diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h
index 8b54c9415b..7f7b537721 100644
--- a/libavutil/pixfmt.h
+++ b/libavutil/pixfmt.h
@@ -457,6 +457,7 @@ enum AVColorPrimaries {
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 = AVCOL_PRI_JEDEC_P22,
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, \
--
2.17.1
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-devel] [PATCH] colorspace: Rename jedec-p22 to ebu3213
From: Raphaël Zumer
Internally, this adds an EBU3213 alias to JEDEC_P22,
and changes the name string to match ITU-T H.273.
---
libavcodec/options_table.h | 2 +-
libavfilter/vf_colorspace.c | 2 +-
libavfilter/vf_setparams.c | 2 +-
libavfilter/vf_zscale.c | 2 +-
libavutil/pixdesc.c | 2 +-
libavutil/pixfmt.h | 1 +
6 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index 4a266eca16..9d82188171 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -365,7 +365,7 @@ static const AVOption avcodec_options[] = {
{"smpte428_1", "SMPTE 428-1",0, AV_OPT_TYPE_CONST, {.i64 =
AVCOL_PRI_SMPTE428 }, INT_MIN, INT_MAX, V|E|D, "color_primaries_type"},
{"smpte431","SMPTE 431-2",0, AV_OPT_TYPE_CONST, {.i64 =
AVCOL_PRI_SMPTE431 }, INT_MIN, INT_MAX, V|E|D, "color_primaries_type"},
{"smpte432","SMPTE 422-1",0, AV_OPT_TYPE_CONST, {.i64 =
AVCOL_PRI_SMPTE432 }, INT_MIN, INT_MAX, V|E|D, "color_primaries_type"},
-{"jedec-p22", "JEDEC P22", 0, AV_OPT_TYPE_CONST, {.i64 =
AVCOL_PRI_JEDEC_P22 },INT_MIN, INT_MAX, V|E|D, "color_primaries_type"},
+{"ebu3213", "EBU 3213-E", 0, AV_OPT_TYPE_CONST, {.i64 =
AVCOL_PRI_JEDEC_P22 },INT_MIN, INT_MAX, V|E|D, "color_primaries_type"},
{"unspecified", "Unspecified",0, AV_OPT_TYPE_CONST, {.i64 =
AVCOL_PRI_UNSPECIFIED }, INT_MIN, INT_MAX, V|E|D, "color_primaries_type"},
{"color_trc", "color transfer characteristics", OFFSET(color_trc),
AV_OPT_TYPE_INT, {.i64 = AVCOL_TRC_UNSPECIFIED }, 1, INT_MAX, V|E|D,
"color_trc_type"},
{"bt709","BT.709", 0, AV_OPT_TYPE_CONST, {.i64 =
AVCOL_TRC_BT709 },INT_MIN, INT_MAX, V|E|D, "color_trc_type"},
diff --git a/libavfilter/vf_colorspace.c b/libavfilter/vf_colorspace.c
index df6efffb3d..5f22f92507 100644
--- a/libavfilter/vf_colorspace.c
+++ b/libavfilter/vf_colorspace.c
@@ -968,7 +968,7 @@ static const AVOption colorspace_options[] = {
ENUM("smpte431", AVCOL_PRI_SMPTE431, "prm"),
ENUM("smpte432", AVCOL_PRI_SMPTE432, "prm"),
ENUM("bt2020", AVCOL_PRI_BT2020, "prm"),
-ENUM("jedec-p22",AVCOL_PRI_JEDEC_P22, "prm"),
+ENUM("ebu3213", AVCOL_PRI_JEDEC_P22, "prm"),
{ "trc","Output transfer characteristics",
OFFSET(user_trc), AV_OPT_TYPE_INT, { .i64 = AVCOL_TRC_UNSPECIFIED },
diff --git a/libavfilter/vf_setparams.c b/libavfilter/vf_setparams.c
index fe298e5a06..80e61f851e 100644
--- a/libavfilter/vf_setparams.c
+++ b/libavfilter/vf_setparams.c
@@ -74,7 +74,7 @@ static const AVOption setparams_options[] = {
{"smpte428",NULL, 0, AV_OPT_TYPE_CONST,
{.i64=AVCOL_PRI_SMPTE428}, INT_MIN, INT_MAX, FLAGS, "color_primaries"},
{"smpte431",NULL, 0, AV_OPT_TYPE_CONST,
{.i64=AVCOL_PRI_SMPTE431}, INT_MIN, INT_MAX, FLAGS, "color_primaries"},
{"smpte432",NULL, 0, AV_OPT_TYPE_CONST,
{.i64=AVCOL_PRI_SMPTE432}, INT_MIN, INT_MAX, FLAGS, "color_primaries"},
-{"jedec-p22", NULL, 0, AV_OPT_TYPE_CONST,
{.i64=AVCOL_PRI_JEDEC_P22},INT_MIN, INT_MAX, FLAGS, "color_primaries"},
+{"ebu3213", NULL, 0, AV_OPT_TYPE_CONST,
{.i64=AVCOL_PRI_JEDEC_P22},INT_MIN, INT_MAX, FLAGS, "color_primaries"},
{"color_trc", "select color transfer", OFFSET(color_trc), AV_OPT_TYPE_INT,
{.i64=-1}, -1, AVCOL_TRC_NB-1, FLAGS, "color_trc"},
{"auto", "keep the same color transfer", 0, AV_OPT_TYPE_CONST, {.i64=-1},
INT_MIN, INT_MAX, FLAGS, "color_trc"},
diff --git a/libavfilter/vf_zscale.c b/libavfilter/vf_zscale.c
index f0309272fa..e53d7c1ae0 100644
--- a/libavfilter/vf_zscale.c
+++ b/libavfilter/vf_zscale.c
@@ -788,7 +788,7 @@ static const AVOption zscale_options[] = {
{ "smpte428", 0, 0, AV_OPT_TYPE_CONST,
{.i64 = ZIMG_PRIMARIES_ST428}, 0, 0, FLAGS, "primaries" },
{ "smpte431", 0, 0, AV_OPT_TYPE_CONST,
{.i64 = ZIMG_PRIMARIES_ST431_2}, 0, 0, FLAGS, "primaries" },
{ "smpte432", 0, 0, AV_OPT_TYPE_CONST,
{.i64 = ZIMG_PRIMARIES_ST432_1}, 0, 0, FLAGS, "primaries" },
-{ "jedec-p22",0, 0, AV_OPT_TYPE_CONST,
{.i64 = ZIMG_PRIMARIES_EBU3213_E}, 0, 0, FLAGS, "primaries" },
+{ "ebu3213", 0, 0, AV_OPT_TYPE_CONST,
{.i64 = ZIMG_PRIMARIES_EBU3213_E}, 0, 0, FLAGS, "primaries" },
{ "transfer", "set transfer characteristic", OFFSET(trc), AV_OPT_TYPE_INT,
{.i64 = -1}, -1, INT_MAX, FLAGS, "transfer" },
{ "t","set transfer characteristic", OFFSET(trc), AV_OPT_TYPE_INT,
{.i64 = -1}, -1, INT_MAX, FLAGS, "transfer" },
{ "input",0, 0, AV_OPT_TYPE_CONST,
{.i64 = -1}, 0,
