From patchwork Wed Dec 15 21:32:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 32647 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp222808iog; Wed, 15 Dec 2021 13:32:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJwfv4VpqqvP+DBEgnJY+HaARG61/XaSnemINy4UTPJKHEew81GB0cWJibG5vCtZ45mnXUO3 X-Received: by 2002:a17:906:f2c5:: with SMTP id gz5mr5224884ejb.112.1639603957053; Wed, 15 Dec 2021 13:32:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639603957; cv=none; d=google.com; s=arc-20160816; b=ubMJVzpO35TLSCJuODYV31T0EupJHlGMqkSyiIq4zy+8/1xSLXFc6rdzRY1LZA6TTx jiZVMRRYOJUNIxBjnmalVQ49CKfUm5BMOrKwIsK+pasYIUITqPlVyZmy5UICyj92V1MQ GmbsaN9IRAjJ6bqoFdwH7G4GWN/VMPpIFUr31nxm6Ej75IN2s52NanVGbePbMuaN6bJi Oj4gobnbklnNV5LFF88aG7mfxtn8ZAmeErrVbKLfnmhTzU53vBXi3pH4QPsULQy6IqMf 6odUUuOiRsAP2D5e76BTlP1Y9aT1AUvsm2V7RgINwp51LkPOh9vYlQjpzCGR/6bzdB/U Wlxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=RGT1sUff/R/FQHZoejqsW8KF+wrMsWeFqecoSJ6iTiw=; b=khHecqdUeE5W94ODM2HWURvkxYnVxDdaHUyHkAVWaSvVgPsoqsqPbmJeGudFZloccn 6p5PJ1I/HzkRX2PEuBQvGOxNpyO89zva5f9VSYu4aVX/FO9Z38KRc1jv9jclRPkw5ZLU vOyJJLBG1KB7F3oHBFveqRUeuJNEY530cpgMFD2DRPN2zZc0tncAfLqCnpv/nk0nuyUw FaMzo/rKbsCZ4pdL7gH9qUG8LH4urkfa/pkskSMhCtFB7v6MgJ0+n3JHvbtWSA8byCEY A0xQgBiWNoZs6/nSu2+0IaRkxZJCv2ji92hhG3/xmjLOAAYpKKJHDnalupPQHaTrS+D6 6/oQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=FTOsjdgb; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id mp19si2238804ejc.801.2021.12.15.13.32.35; Wed, 15 Dec 2021 13:32:37 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=FTOsjdgb; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CB02D68AD0A; Wed, 15 Dec 2021 23:32:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7940468A58D for ; Wed, 15 Dec 2021 23:32:25 +0200 (EET) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id D6A2442D2E; Wed, 15 Dec 2021 22:32:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1639603944; bh=PIoXf+vvTn6kAwcaNep5e1qdkjZK1xKPe/m4A7IcQck=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FTOsjdgb3BQGzaGE70MgdzPPXp2ve9UnA2GtW+1xWp8DfCQM8pmZNCTNhMmU6zGjH vqhtaKTVUggF9nfGSvhB7nW/srxijaFInI8ga6kjzQ4YwkkkVzOq9RUldAp6qlHbC5 I2lxsyUcg9Dr8oAa+mfJBGFRuzlZYSwaxIKr2Dlo= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Wed, 15 Dec 2021 22:32:15 +0100 Message-Id: <20211215213215.96223-1-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] lavfi/vf_libplacebo: update deprecated option name X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: kaYDuKN5OX9S From: Niklas Haas 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 --- 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 },