diff options
| author | James Almer <jamrial@gmail.com> | 2016-09-28 13:09:26 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2016-09-28 13:09:26 -0300 |
| commit | f013ba475b0dbf71e2804c57e67bf308ae636f2b (patch) | |
| tree | 4b6476c2ab67903e03a41afb115136fbc269338c | |
| parent | 3597d32e88c8e0c6e6f25fe73a9ebd235c879c2b (diff) | |
| parent | 5d560d38deca1e4705e6d3784d737363b9c830fe (diff) | |
| download | ffmpeg-f013ba475b0dbf71e2804c57e67bf308ae636f2b.tar.gz | |
Merge commit '5d560d38deca1e4705e6d3784d737363b9c830fe'
* commit '5d560d38deca1e4705e6d3784d737363b9c830fe':
pixfmt: Add ARIB STD-B76 color transfer characteristic
See 785038c92cc7fc1da437576382083246ca598fce
Conflicts:
libavcodec/options_table.h
libavcodec/version.h
libavutil/pixdesc.c
libavutil/version.h
Merged-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavcodec/options_table.h | 1 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index fe354549a8..88dee6198a 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -477,6 +477,7 @@ static const AVOption avcodec_options[] = { {"bt2020_12bit", "BT.2020 - 12 bit", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_TRC_BT2020_12 }, INT_MIN, INT_MAX, V|E|D, "color_trc_type"}, {"smpte2084", "SMPTE ST 2084", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_TRC_SMPTEST2084 }, INT_MIN, INT_MAX, V|E|D, "color_trc_type"}, {"smpte428_1", "SMPTE ST 428-1", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_TRC_SMPTEST428_1 }, INT_MIN, INT_MAX, V|E|D, "color_trc_type"}, +{"arib-std-b67", "ARIB STD-B67", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_TRC_ARIB_STD_B67 }, INT_MIN, INT_MAX, V|E|D, "color_trc_type"}, {"colorspace", "color space", OFFSET(colorspace), AV_OPT_TYPE_INT, {.i64 = AVCOL_SPC_UNSPECIFIED }, 0, AVCOL_SPC_NB-1, V|E|D, "colorspace_type"}, {"rgb", "RGB", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_SPC_RGB }, INT_MIN, INT_MAX, V|E|D, "colorspace_type"}, {"bt709", "BT.709", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_SPC_BT709 }, INT_MIN, INT_MAX, V|E|D, "colorspace_type"}, diff --git a/libavcodec/version.h b/libavcodec/version.h index e7778e9bc0..5889879c60 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 57 #define LIBAVCODEC_VERSION_MINOR 58 -#define LIBAVCODEC_VERSION_MICRO 102 +#define LIBAVCODEC_VERSION_MICRO 103 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |