summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaphaël Zumer <rzumer@tebako.net>2019-08-11 09:54:58 -0400
committerJames Almer <jamrial@gmail.com>2019-09-01 20:00:58 -0300
commita12b629ae1290966d49849b464688ef2918d9f4c (patch)
tree89ee4dc97eb69ec8815059ba83289e77f363ced0
parent08dfd57fd83a4b65ffa0c8bac7f9432b5d255524 (diff)
downloadffmpeg-streaming-a12b629ae1290966d49849b464688ef2918d9f4c.zip
ffmpeg-streaming-a12b629ae1290966d49849b464688ef2918d9f4c.tar.gz
avcodec: Support EBU Tech. 3213-E primaries values
Signed-off-by: Raphaël Zumer <rzumer@tebako.net> Signed-off-by: James Almer <jamrial@gmail.com>
-rw-r--r--libavcodec/options_table.h1
-rw-r--r--libavcodec/version.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index 4a266ec..c3a500a 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 ed767c8..b4b79ef 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -29,7 +29,7 @@
#define LIBAVCODEC_VERSION_MAJOR 58
#define LIBAVCODEC_VERSION_MINOR 56
-#define LIBAVCODEC_VERSION_MICRO 100
+#define LIBAVCODEC_VERSION_MICRO 101
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
OpenPOWER on IntegriCloud