From patchwork Mon Jun 15 18:07:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 20421 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 3ED01449A5D for ; Mon, 15 Jun 2020 21:07:33 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1A3E868B310; Mon, 15 Jun 2020 21:07:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EF169680812 for ; Mon, 15 Jun 2020 21:07:26 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id d128so504349wmc.1 for ; Mon, 15 Jun 2020 11:07:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=3j/nFApe4ZXGt9Uh23ccFD06HLlW7NJBgt0s0q5l4TQ=; b=C17SqinLwMnRcTuZcGCSHEYP6lMxMydZmYyTo49zAYYT0xWx+k8ENmvt+Ff4whb/OP isk6f1rT7zMxCh/TZKnjvCaY2U6Y3wG2sDWgXQqBxiKOrxMGG/un0CKPEUQ2zhi7YEk/ jDkZg1N2YjpM4Y/JvhOu8xkGj+SMltJY6Js3iUPmYRKrlC9vX2pnU2V4ainvetlvqIjx FYjqq5Cf6e4pn4ZZLPDqPUDBTqbuGuLzX3e9vcUrLtQU2hFc1QxEe9vLeOD/e55+FZWN T6uYozUwrMHMXH4+LE5NG+6hH7afQ/6uGi502qZHSPxDSK0x+LhJ1oUTbH+COt4WjVXf pbXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=3j/nFApe4ZXGt9Uh23ccFD06HLlW7NJBgt0s0q5l4TQ=; b=LgoWnUQ/HRjfvCrB9K5QOWorpP/oSu3P3aUgRuHYmoraSmlwBzLFQJccgHxFlUfyS7 dI0o0rSP65yheJffbWuPY1x0S+H6XFLi/4Mw86AixuP1a6I1iXZgGANu2gZ6VfzjvL7N vypNyrlkfdObfPx1YjSCJGm4BsPTqKnU+J/UFpKP+j9YH6JnXZ9sz7vjy8oOfEuSO31Y QDIzEdlPfLPblvHT+nmUrbQt9W635/AcHJYpbPA5PrkOBczom1NXK4GDnuD8bYnxsVVi v8eZoEycpOLTmA1UJkbRSUfHRSqTtJaHO7rOjrzRP1S2U4wg3wZw3j5sbSuAUCoIU1vp wyng== X-Gm-Message-State: AOAM532hqndnVxmy6rglvL0D4MGColAEVjA4OidwKc3zYG+S9YmAq5eJ uYbDcMRxtUgRPGrlvE12psoMvstL X-Google-Smtp-Source: ABdhPJwvMnvfIlTJKMX9Su5T6EY03n1AY73jldJ4NipSRz9oKMGh6UmSRuwWRb3sKxq7HCrZF4VnKA== X-Received: by 2002:a1c:32c4:: with SMTP id y187mr542041wmy.79.1592244446013; Mon, 15 Jun 2020 11:07:26 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id f16sm427283wmh.27.2020.06.15.11.07.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2020 11:07:25 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Jun 2020 20:07:18 +0200 Message-Id: <20200615180718.29414-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avfilter/vf_showpalette: Don't pretend disp_palette can fail X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" It can't fail, yet it returns an int and other code checks whether it failed; yet if it did fail, an AVFrame would leak. One could of course add an av_frame_free for this (that compilers could optimize away), yet it is easier to simply stop pretending that disp_palette could fail. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_showpalette.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libavfilter/vf_showpalette.c b/libavfilter/vf_showpalette.c index 5b0772bc0b..f715d6bc2c 100644 --- a/libavfilter/vf_showpalette.c +++ b/libavfilter/vf_showpalette.c @@ -76,7 +76,7 @@ static int config_output(AVFilterLink *outlink) return 0; } -static int disp_palette(AVFrame *out, const AVFrame *in, int size) +static void disp_palette(AVFrame *out, const AVFrame *in, int size) { int x, y, i, j; uint32_t *dst = (uint32_t *)out->data[0]; @@ -88,12 +88,10 @@ static int disp_palette(AVFrame *out, const AVFrame *in, int size) for (j = 0; j < size; j++) for (i = 0; i < size; i++) dst[(y*dst_linesize + x) * size + j*dst_linesize + i] = pal[y*16 + x]; - return 0; } static int filter_frame(AVFilterLink *inlink, AVFrame *in) { - int ret; AVFrame *out; AVFilterContext *ctx = inlink->dst; const ShowPaletteContext *s = ctx->priv; @@ -105,9 +103,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) return AVERROR(ENOMEM); } av_frame_copy_props(out, in); - ret = disp_palette(out, in, s->size); + disp_palette(out, in, s->size); av_frame_free(&in); - return ret < 0 ? ret : ff_filter_frame(outlink, out); + return ff_filter_frame(outlink, out); } static const AVFilterPad showpalette_inputs[] = {