From patchwork Wed Jan 1 05:22:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 17111 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 B239244B042 for ; Wed, 1 Jan 2020 07:22:26 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 98ADB68AD48; Wed, 1 Jan 2020 07:22:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C66BD68AD2B for ; Wed, 1 Jan 2020 07:22:19 +0200 (EET) Received: by mail-pf1-f193.google.com with SMTP id i23so15034643pfo.2 for ; Tue, 31 Dec 2019 21:22:19 -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; bh=zAR0KNLgjbtTloAVoydPfYwsNWNH2WO3Vyb6cy0eogc=; b=QMcZoAWJG3excgqLvTZM2fo8ibkUOja+KMl34fmTZ1vZVjpMr6hTgQM2As73dsjLVF YI/ngNVXSxT5FGdnx9GQWX4vwoQNFhZFDAwsJPWFDPfFiGfXsf5uklSrxrAGYis7oRvd bOpjfURQJeUJDVVPtHs9c1BOAYb2I7fx43OWk6d46TBxY9kvIbo2Kp3lEdoDfNoLmDUL TZ7O6jQRXo82KmgPY8BYwlM8AdITy5DqZi42dumE2zwIaRYsx6SK162BSD9vujr0b7Uk 70sfAQNDYgOC3sPJIrkKFDLTbf616wUdWNZestVPVAq95LgSztf96fIXrYFuPWTcu1pe t7tA== 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; bh=zAR0KNLgjbtTloAVoydPfYwsNWNH2WO3Vyb6cy0eogc=; b=AR32pEWixVj8ZflvVR8K6k/rU4VDMTPG5A1pj/npQ+pp+LE73UCyrJDG14U5rnHZ55 QaYK54/VZ6nWsMVTBlXwdBq4KURwpX5J/6hzXaFRcS7UPPSWq+v4WPyiV0rtArjJmR46 qmYrzwKoYvOkyOjTTIWDebCsWmuJY1n8yCKGjjzjxyFGqkS4aHFsDgozoXPGvZGvP0Cz QFdqYwtS4gk0hQWkNMi9K/zU35YldGTqAjjf01XNCS/gQOhdOlNfRyU+UGNB+7wyZkHY yrRwNV2y5QDZNhVdbON0/Y8BPoVzsrWf/IRHXx+3u+uqmb+KKYlDQRm60LS17wUWknBy 4VhA== X-Gm-Message-State: APjAAAX/s5oDhef3udbsQvWfLy+t80FPOuGN4VCkS9A/4ITcekrVKqFh c9Jav8sK5zjvWYcIfGGhAWvBm1SY X-Google-Smtp-Source: APXvYqx5OvH2A4pJ29O1BVN21G0vdP7uLSsOUqHzNNKeRRhDcT3XlTLf+Nb09oB+JywS9SYwuigC2A== X-Received: by 2002:a63:c20c:: with SMTP id b12mr80350379pgd.407.1577856138157; Tue, 31 Dec 2019 21:22:18 -0800 (PST) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id hg11sm5608282pjb.14.2019.12.31.21.22.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Dec 2019 21:22:17 -0800 (PST) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Jan 2020 13:22:13 +0800 Message-Id: <1577856133-17464-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 Subject: [FFmpeg-devel] [PATCH V1] lavfi/buffersrc: Remove redundancy free after ff_filter_frame 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao ff_filter_frame always free the frame in case of error, so we don't need to free the frame after ff_filter_frame fail. Signed-off-by: Jun Zhao --- libavfilter/buffersrc.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c index 64940d9..bf30f54 100644 --- a/libavfilter/buffersrc.c +++ b/libavfilter/buffersrc.c @@ -240,10 +240,8 @@ static int av_buffersrc_add_frame_internal(AVFilterContext *ctx, } ret = ff_filter_frame(ctx->outputs[0], copy); - if (ret < 0) { - av_frame_free(©); + if (ret < 0) return ret; - } if ((flags & AV_BUFFERSRC_FLAG_PUSH)) { ret = push_frame(ctx->graph);