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 73F8D4652E for ; Sun, 21 May 2023 12:25:18 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5CD5468C13A; Sun, 21 May 2023 15:24:50 +0300 (EEST) Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E7CE768C052 for ; Sun, 21 May 2023 15:24:41 +0300 (EEST) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 9B1DF48FA1; Sun, 21 May 2023 14:24:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1684671881; bh=S8gVQwQMz/jrlKH9xnYCuYJ9nqv8TzEi9EICLqNgjMw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OlMuwHEVHcKJNXg7c+7f+yGsVm9QwHNfWJpbcwPv2+d1nHmZ7hdyD168rPlp/+0Ip 5HRqFH9zbXDSMszKKTsxIUjzcMsZnnbz6y8wx5xywMVmpOwaD7/g/5GkL1YhCBGZDT xoxGh+761uGyj10gYlii0rxbN6qMDpKW5avO0lUA= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Sun, 21 May 2023 14:24:38 +0200 Message-Id: <20230521122438.78375-4-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230521122438.78375-1-ffmpeg@haasn.xyz> References: <20230521122438.78375-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] lavfi/vf_libplacebo: don't intrude on pl_ namespace 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 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: From: Niklas Haas No reason to use this prefix here. --- libavfilter/vf_libplacebo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c index dda6f6279c2..6ff30948a78 100644 --- a/libavfilter/vf_libplacebo.c +++ b/libavfilter/vf_libplacebo.c @@ -267,7 +267,7 @@ static void pl_av_log(void *log_ctx, enum pl_log_level level, const char *msg) av_log(log_ctx, av_lev, "%s\n", msg); } -static const struct pl_tone_map_function *pl_get_tonemapping_func(int tm) { +static const struct pl_tone_map_function *get_tonemapping_func(int tm) { switch (tm) { case TONE_MAP_AUTO: return &pl_tone_map_auto; case TONE_MAP_CLIP: return &pl_tone_map_clip; @@ -425,7 +425,7 @@ static int update_settings(AVFilterContext *ctx) .tone_mapping_mode = s->tonemapping_mode, .tone_mapping_crosstalk = s->crosstalk, #endif - .tone_mapping_function = pl_get_tonemapping_func(s->tonemapping), + .tone_mapping_function = get_tonemapping_func(s->tonemapping), .tone_mapping_param = s->tonemapping_param, .inverse_tone_mapping = s->inverse_tonemapping, .lut_size = s->tonemapping_lut_size, -- 2.40.1 _______________________________________________ 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".