From patchwork Tue Feb 1 15:06:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 34040 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp700585iov; Tue, 1 Feb 2022 07:07:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJz1/eNNLLClcRzKoBY5vS3zfEKbspeoTVkTpQHfe0QfUs9xJxjUXuRKFEPHy0OAR8u59naY X-Received: by 2002:a05:6402:490:: with SMTP id k16mr25412510edv.204.1643728038896; Tue, 01 Feb 2022 07:07:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643728038; cv=none; d=google.com; s=arc-20160816; b=GiiTSIq7Ofm/ukPtgd7OXqeyAbkcoFLguN694RdsbguZq5R11e1PZpMen80hq7JdAx guwX+9F32QoLc6NxNyVZu4oWkdbDzn9cBbfjAoURkWE7WX8UR9v6RLluWUVHkQ3ajYU8 7nCdFjVCghbFl4ENfw28lSbw1TYLl/OKz5UpcdhMWFZ9sbKXF6OkHrqgGZo116Q7l000 iDnfAWwrODexWsjwG5FXhJXVA9ZKUpjsCQZlN6OVIgvJfWRVxgUN6x6NEs6FguX4l7/1 lt05vrEICFpU7fV1wGf2qkl/bRpbXiu2VJzlxZKoHMLZ0T/GWssGF5X3v/ewcWjvvyJj +tew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=QoksE1lt0zfNvCIB4YhEmujhozIV3yPlutvS7kJKgm8=; b=ECDRHPRkbx2U3Q8lfrrQrgOM7fjGtc9iykvsXWpMSPKiqm403+dFmZ2TEBuC5B6MET wUV5J+O9nHRU6l9SFl9Q093ukyxfFr9u0fxVE11PCU7BIcQDJ1cxG+ZxdatufQkmiN3c oFH58+6nOQJHsBk8D0/O4DnqlH1SIF0VE7gE2zi6dbqtjH2PAEhR8u6gOJ2I4GWKC2a0 UWkS05vgfYz5RqMA0u2VvsfEb31Iol6oVyBdMpyctY0JaoFmPfEc5c38mVuDHkcdzDHx OgkPEOXtpvjMfHsQYSF6cXK8QKqyvQWucRf8IHk3bN+M/n+6s4/F2KlReK79Wq0auYBO OZsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="Rh1/EofI"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s9si8272642ejm.447.2022.02.01.07.07.17; Tue, 01 Feb 2022 07:07:18 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="Rh1/EofI"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CAF8F68B3FE; Tue, 1 Feb 2022 17:07:12 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f43.google.com (mail-ot1-f43.google.com [209.85.210.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3A45768B37F for ; Tue, 1 Feb 2022 17:07:06 +0200 (EET) Received: by mail-ot1-f43.google.com with SMTP id b17-20020a9d4791000000b005a17fc2dfc1so16517399otf.1 for ; Tue, 01 Feb 2022 07:07:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=rCYdEkdQztgtpaYkSG05HYJcLwsyxmzg+pLSGtteGv4=; b=Rh1/EofIKE88Eq4l9NhUoxo4He9owptkZO1KIJGgYLWRRVW/qKlmHlIx6luXyBunaw xICSDn+CuEYzdlpl6nUjfN5njTuLlNc0v+fxR1xU0VYVGFcF9BJde/zE78M0K9FIAFAY VRlb42uwTlJ9LaHi8H4KRuii7oP/2SQg/cHm/xCHINsUlMqi4LfJc5Ahrra2YlFun8JM UWU10DbrwCjlz9IiZNOLA9PPJLqy6ItunC9MzKinq4GMCG5Xc4LWbLX5Wal8ubCoLXV8 MrHCAHo68w/wZ7y62uZpQMCcxjxPea8B++P/9aI44EpfZonfL/kKEBnjQwfavo6fj44C ZZyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=rCYdEkdQztgtpaYkSG05HYJcLwsyxmzg+pLSGtteGv4=; b=YZUZcYfWMsrroLPsr8oLUR2prACW6DNAC2NG3VjwZjPqHdF8VAbJtObdBItS8W14mN p8OpkYp8aJVqRHHa0Eti7mvTkHbVK4GfHpu5zmwSJHhfaQf+WeLnKdZc3XTm3IKXqVzS A+63oNDnAdObd+PR2vkW3jyATvdlbDBP5cQmj7R3h4mJqjsYhB/AOTVnrpJikp+Df4iX Rf7Q+URj77pRJS+RAKFUERo9hIf/bpgVjyiDfxorzukggW0JKtmXRPHgtPgdLYEC/Mg5 h4qkk4FwitObEFuFaRdXTsgtmlrSVSiXUyAeFF5zpzQx4auwjbaptSpGWl+8VzgUrePK d/5A== X-Gm-Message-State: AOAM533fZINH1a0Ul2WDv/L/jsPSC5jRmW99ZFtD7Oc08SsTX2h9kk9Y fFeiws5UHGbpXZY4q+QRV1iqj7bpNkQ= X-Received: by 2002:a9d:7f8e:: with SMTP id t14mr13760031otp.198.1643728024225; Tue, 01 Feb 2022 07:07:04 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id u25sm17836055oth.56.2022.02.01.07.07.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 07:07:03 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Feb 2022 12:06:34 -0300 Message-Id: <20220201150634.4076-1-jamrial@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/libdav1d: free the Dav1dData packet on dav1d_send_data() failure 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: c+zZrRX0pAl4 We still own it on failure, and there's no point trying to feed it again. Signed-off-by: James Almer --- libavcodec/libdav1d.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index 29fa4f9c3d..872e60e000 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -347,8 +347,10 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) if (res < 0) { if (res == AVERROR(EINVAL)) res = AVERROR_INVALIDDATA; - if (res != AVERROR(EAGAIN)) + if (res != AVERROR(EAGAIN)) { + dav1d_data_unref(data); return res; + } } res = dav1d_get_picture(dav1d->c, p);