From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id A111042043 for ; Wed, 15 Dec 2021 22:40:42 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9A14068A993; Thu, 16 Dec 2021 00:40:40 +0200 (EET) Received: from w4.tutanota.de (w4.tutanota.de [81.3.6.165]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9912268A42C for ; Thu, 16 Dec 2021 00:40:34 +0200 (EET) Received: from w3.tutanota.de (unknown [192.168.1.164]) by w4.tutanota.de (Postfix) with ESMTP id 1E138106028B for ; Wed, 15 Dec 2021 22:40:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1639608033; s=s1; d=lynne.ee; h=From:From:To:To:Subject:Subject:Content-Description:Content-ID:Content-Type:Content-Type:Content-Transfer-Encoding:Content-Transfer-Encoding:Cc:Date:Date:In-Reply-To:In-Reply-To:MIME-Version:MIME-Version:Message-ID:Message-ID:Reply-To:References:References:Sender; bh=PSBbapleUc2qQvKqYKgc3aYMaI1Uzo30x3SRs++rBlk=; b=xBxHjZfoVARwa1zGC0hFD5SMtxj/OxLqIkDdcxl9lH6YoFJiWKQkw1O60v7J+PWs e+ELsDbsHMs3zyz3uf0/F8md1M455bhKr1YSnyEnJZPzxKJWAP9yuZCRQzKshq67kHo +fsGPL3qYtbJzsUSwyx3bQalXX/Yy8RvVg9avuazcyPosel3c6Z0hWAJv3HaqUXNRzB 4yrr5FHnG+PCvf5fE5UHIrJJFmk/fUgwtR+2qew5JcXkBEvVAeQVj4CtPo5GIthqxTF 4Ml2a5vFUikQiAGlQbx056tNaND/SUH2CItcSoRRvRPYUqNzJPsTnDH5k9W+rtKTSV1 I+6Xl3aaVw== Date: Wed, 15 Dec 2021 23:40:33 +0100 (CET) From: Lynne To: FFmpeg development discussions and patches Message-ID: In-Reply-To: <20211215213215.96223-1-ffmpeg@haasn.xyz> References: <20211215204747.54229-1-ffmpeg@haasn.xyz> <20211215213215.96223-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: Re: [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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 15 Dec 2021, 22:32 by ffmpeg@haasn.xyz: > 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 }, > Thanks, pushed both this patch and your helpers patch. _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".