aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2016-10-18 18:16:29 -0400
committerVittorio Giovara <vittorio.giovara@gmail.com>2016-10-21 11:46:21 -0400
commit0d9b9bd37f43ee29ad9f709d85c8f3be9db71104 (patch)
tree63ef616e92545ecab43e5a96d91e1f1f20aa7f6f /libavcodec
parent7c9e2b295e4f70e8fedf9cceb12d95399a859a9c (diff)
downloadffmpeg-0d9b9bd37f43ee29ad9f709d85c8f3be9db71104.tar.gz
lavu: Add JEDEC P22 color primaries
Diffstat (limited to 'libavcodec')
-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 5090806f36..04cb20d154 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -438,6 +438,7 @@ static const AVOption avcodec_options[] = {
{"smpte428", "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"},
{"unspecified", "Unspecified", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_PRI_UNSPECIFIED }, INT_MIN, INT_MAX, V|E|D, "color_primaries_type"},
{"smptest428_1", "SMPTE 428-1", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_PRI_SMPTE428 }, 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, AVCOL_TRC_NB-1, V|E|D, "color_trc_type"},
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 64b0ee6fd6..6f439c02c8 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -29,7 +29,7 @@
#define LIBAVCODEC_VERSION_MAJOR 57
#define LIBAVCODEC_VERSION_MINOR 28
-#define LIBAVCODEC_VERSION_MICRO 0
+#define LIBAVCODEC_VERSION_MICRO 1
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \