From patchwork Mon Jan 27 08:28:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 17584 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 3F45144B390 for ; Mon, 27 Jan 2020 10:29:11 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2E2AB68B0D2; Mon, 27 Jan 2020 10:29:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BEA1E68AF84 for ; Mon, 27 Jan 2020 10:29:02 +0200 (EET) Received: by mail-wm1-f46.google.com with SMTP id g1so5825799wmh.4 for ; Mon, 27 Jan 2020 00:29:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=H3iFi4ulbXhDEv/FK+gB35OPOROo19capWDO52RreVE=; b=IkTnbtmOyeAO3ChNyBxvYGU2WmzPpQEWoxXmFmNC9XHDtIQZwbWuYpFeiQQNleUr/a qs1nKvjESHE1lXvLnTFjdDVJKZto8MEusMHZNIljWkCkAYrV4W6l51oZ1EBh91sDaUgX 9EbAtKewcM1Di55/pLJ2jqEro/BNHQgVruMxUtuJWomvQNZJ1d/tKoxod9sSLDVceVGR H8fkT39vXdtroG4gOHfB7ulcawX1TQ5xWvP2dGsxhj7R9VTkTRATsIgPtLKaIYVrkGS/ B01TfijE9Lal+AkX8ShP7GSXeXeEpExiDMBu/uYW0o1O52da+5FnwO0FZ0uOzvTSxp5Q PhTA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=H3iFi4ulbXhDEv/FK+gB35OPOROo19capWDO52RreVE=; b=irl1eLbmoLjLoVDal/1mRcfDTmN2/Fj9VrPei6/yr0c4AqexuLACz/kG3uxQstkPUw dbI60HezRL8gmpZD/rv4ropp4cyFBONw8M3RZe/IuE/4SD+AOitNzoSvZwv5pZAwlVc9 OLSvsvBzzpGQ+hHVPhF+nqhf2+T5pVMq9x8Yx5w9tbZXKqqIJApvgoP3GiDphlzkUhyX M9J/n1gJQFWK/lk18O+ff2I3D04aRCzDsFVH86vfktTPy39RsY+C0VjITRZbaypoXQ0e kkz0A4Z9vLYwPeSxuLeH5WDu4WhE3SCFC/sArySCv5nm2RoGdmT7/ZCEZHxBK6FgWAt7 j8fw== X-Gm-Message-State: APjAAAU44M3rj3iGU3kIm686A0r8v2sEzoZhI2VQV2BnonM6k6+qhPgo AQwfZhfw6SnppyWgXH+UFN0qm/oC X-Google-Smtp-Source: APXvYqzGHyobsf3xRmS27qYSxhNgPtQ2VqE+sd9evbPcrwcD99baU1r83h7vDtb3qzW3q9bA5i7Nwg== X-Received: by 2002:a1c:9a8d:: with SMTP id c135mr12041279wme.183.1580113742041; Mon, 27 Jan 2020 00:29:02 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08bbf.dynamic.kabel-deutschland.de. [188.192.139.191]) by smtp.gmail.com with ESMTPSA id o2sm16974156wmh.46.2020.01.27.00.29.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jan 2020 00:29:01 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 27 Jan 2020 09:28:21 +0100 Message-Id: <20200127082821.22770-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200127082821.22770-1-andreas.rheinhardt@gmail.com> References: <20200127082821.22770-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] avfilter/vf_paletteuse: Forward error codes 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" Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_paletteuse.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavfilter/vf_paletteuse.c b/libavfilter/vf_paletteuse.c index 255c9d79e3..408cff786e 100644 --- a/libavfilter/vf_paletteuse.c +++ b/libavfilter/vf_paletteuse.c @@ -912,12 +912,12 @@ static int apply_palette(AVFilterLink *inlink, AVFrame *in, AVFrame **outf) s->last_out, out, &x, &y, &w, &h); av_frame_unref(s->last_in); av_frame_unref(s->last_out); - if (av_frame_ref(s->last_in, in) < 0 || - av_frame_ref(s->last_out, out) < 0 || - av_frame_make_writable(s->last_in) < 0) { + if ((ret = av_frame_ref(s->last_in, in)) < 0 || + (ret = av_frame_ref(s->last_out, out)) < 0 || + (ret = av_frame_make_writable(s->last_in)) < 0) { av_frame_free(&out); *outf = NULL; - return AVERROR(ENOMEM); + return ret; } ff_dlog(ctx, "%dx%d rect: (%d;%d) -> (%d,%d) [area:%dx%d]\n",