diff --git a/doc/filters.texi b/doc/filters.texi index 47e92b9269..129c7b6cbf 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -16242,9 +16242,6 @@ Disable linear light scaling. @item disable_builtin Disable built-in GPU sampling (forces LUT). -@item force_icc_lut -Force the use of a full ICC 3DLUT for gamut mapping. - @item disable_fbos Forcibly disable FBOs, resulting in loss of almost all functionality, but offering the maximum possible speed. diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c index 7cd495de26..3a40a528d8 100644 --- a/libavfilter/vf_libplacebo.c +++ b/libavfilter/vf_libplacebo.c @@ -97,7 +97,6 @@ typedef struct LibplaceboContext { float polar_cutoff; int disable_linear; int disable_builtin; - int force_icc_lut; int force_dither; int disable_fbos; @@ -137,6 +136,7 @@ typedef struct LibplaceboContext { float desat_exp; int gamut_warning; int gamut_clipping; + int force_icc_lut; /* pl_dither_params */ int dithering; @@ -458,7 +458,6 @@ 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_icc_lut = s->force_icc_lut, .force_dither = s->force_dither, .disable_fbos = s->disable_fbos, }; @@ -847,7 +846,9 @@ static const AVOption libplacebo_options[] = { { "polar_cutoff", "Polar LUT cutoff", OFFSET(polar_cutoff), AV_OPT_TYPE_FLOAT, {.dbl = 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_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 }, +#if FF_API_LIBPLACEBO_OPTS + { "force_icc_lut", "Deprecated, does nothing", OFFSET(force_icc_lut), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, DYNAMIC | AV_OPT_FLAG_DEPRECATED }, +#endif { "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 },