On 8/8/2019 10:29 PM, rzu...@tebako.net wrote:
> From: Raphaël Zumer <rzu...@tebako.net>
>
> This matches a name change in avutil/pixdesc.
>
> Signed-off-by: Raphaël Zumer <rzu...@tebako.net>
> ---
> 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" },
>
You missed the second part of my review, were i asked you to add new
values for ebu3213 and leave the jedec-p22 ones alone, since they are
public facing and can't be removed without a deprecation period.
_______________________________________________
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".
