diff mbox series

[FFmpeg-devel,v2] lavfi/vf_libplacebo: update deprecated option name

Message ID 20211215213215.96223-1-ffmpeg@haasn.xyz
State Accepted
Commit e9ba40c5c9a49bc97d16d66c46ff993fa84a6c31
Headers show
Series [FFmpeg-devel,v2] lavfi/vf_libplacebo: update deprecated option name | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_ppc success Make finished
andriy/make_fate_ppc success Make fate finished

Commit Message

Niklas Haas Dec. 15, 2021, 9:32 p.m. UTC 
From: Niklas Haas <git@haasn.dev>

This was renamed upstream quite a while ago (v3.112.0). Rename the
option name as well for consistency (and expand the description just
slightly).

Signed-off-by: Niklas Haas <git@haasn.dev>
---
 libavfilter/vf_libplacebo.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Lynne Dec. 15, 2021, 10:40 p.m. UTC | #1 
15 Dec 2021, 22:32 by ffmpeg@haasn.xyz:

> From: Niklas Haas <git@haasn.dev>
>
> This was renamed upstream quite a while ago (v3.112.0). Rename the
> option name as well for consistency (and expand the description just
> slightly).
>
> Signed-off-by: Niklas Haas <git@haasn.dev>
> ---
>  libavfilter/vf_libplacebo.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c
> index 7ece9d829e..5b1e7b5285 100644
> --- a/libavfilter/vf_libplacebo.c
> +++ b/libavfilter/vf_libplacebo.c
> @@ -62,7 +62,7 @@ typedef struct LibplaceboContext {
>  float polar_cutoff;
>  int disable_linear;
>  int disable_builtin;
> -    int force_3dlut;
> +    int force_icc_lut;
>  int force_dither;
>  int disable_fbos;
>  
> @@ -357,7 +357,7 @@ static int process_frames(AVFilterContext *avctx, AVFrame *out, AVFrame *in)
>  .polar_cutoff = s->polar_cutoff,
>  .disable_linear_scaling = s->disable_linear,
>  .disable_builtin_scalers = s->disable_builtin,
> -        .force_3dlut = s->force_3dlut,
> +        .force_icc_lut = s->force_icc_lut,
>  .force_dither = s->force_dither,
>  .disable_fbos = s->disable_fbos,
>  };
> @@ -623,7 +623,7 @@ static const AVOption libplacebo_options[] = {
>  { "polar_cutoff", "Polar LUT cutoff", OFFSET(polar_cutoff), AV_OPT_TYPE_FLOAT, {.i64 = 0}, 0.0, 1.0, DYNAMIC },
>  { "disable_linear", "Disable linear scaling", OFFSET(disable_linear), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
>  { "disable_builtin", "Disable built-in scalers", OFFSET(disable_builtin), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
> -    { "force_3dlut", "Force the use of a full 3DLUT", OFFSET(force_3dlut), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
> +    { "force_icc_lut", "Force the use of a full ICC 3DLUT for color mapping", OFFSET(force_icc_lut), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
>  { "force_dither", "Force dithering", OFFSET(force_dither), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
>  { "disable_fbos", "Force-disable FBOs", OFFSET(disable_fbos), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
>  { NULL },
>

Thanks, pushed both this patch and your helpers patch.
diff mbox series

Patch

diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c
index 7ece9d829e..5b1e7b5285 100644
--- a/libavfilter/vf_libplacebo.c
+++ b/libavfilter/vf_libplacebo.c
@@ -62,7 +62,7 @@  typedef struct LibplaceboContext {
     float polar_cutoff;
     int disable_linear;
     int disable_builtin;
-    int force_3dlut;
+    int force_icc_lut;
     int force_dither;
     int disable_fbos;
 
@@ -357,7 +357,7 @@  static int process_frames(AVFilterContext *avctx, AVFrame *out, AVFrame *in)
         .polar_cutoff = s->polar_cutoff,
         .disable_linear_scaling = s->disable_linear,
         .disable_builtin_scalers = s->disable_builtin,
-        .force_3dlut = s->force_3dlut,
+        .force_icc_lut = s->force_icc_lut,
         .force_dither = s->force_dither,
         .disable_fbos = s->disable_fbos,
     };
@@ -623,7 +623,7 @@  static const AVOption libplacebo_options[] = {
     { "polar_cutoff", "Polar LUT cutoff", OFFSET(polar_cutoff), AV_OPT_TYPE_FLOAT, {.i64 = 0}, 0.0, 1.0, DYNAMIC },
     { "disable_linear", "Disable linear scaling", OFFSET(disable_linear), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
     { "disable_builtin", "Disable built-in scalers", OFFSET(disable_builtin), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
-    { "force_3dlut", "Force the use of a full 3DLUT", OFFSET(force_3dlut), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
+    { "force_icc_lut", "Force the use of a full ICC 3DLUT for color mapping", OFFSET(force_icc_lut), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
     { "force_dither", "Force dithering", OFFSET(force_dither), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
     { "disable_fbos", "Force-disable FBOs", OFFSET(disable_fbos), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC },
     { NULL },