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 89F644092D for ; Tue, 1 Feb 2022 15:57:31 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9551E68B456; Tue, 1 Feb 2022 17:57:28 +0200 (EET) Received: from mail-io1-f49.google.com (mail-io1-f49.google.com [209.85.166.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1D2C968B396 for ; Tue, 1 Feb 2022 17:57:22 +0200 (EET) Received: by mail-io1-f49.google.com with SMTP id y84so21850808iof.0 for ; Tue, 01 Feb 2022 07:57:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=0SleEbr8I3SFEMz2Fic/zxpT83JtMeoQeJKyjm5bVbI=; b=HK6fSwgrZcOt1Y4PUFP8v6KE6AN3X8wRynNrxgEbuzptC2youWR1NDsPzzMGf/u05s dXCHyxF9qZoSwivx09JyUnnW7i79ATbmQIUKEH3nxPEVK+weW7TZmBtWKeTn3nuECBmY /zlfXySELvvu10r6pfmLrzZQoXjQ/cG8ijqvNspzBIzafoQ7x2OHWj6Janup45Ax3Jgr MUeiMXyb7gMh/LsParGpggXpKbwiR9iShlWqkiEVHhGwqR0CacSx+qr9hk8nnKOWLCPM Tionhks9s6fQnGtimR8+YRbPI7gZ3sxYJNT/T4xbkvdmSF2TtVTJ05Rh9skcYhQsmYCQ S96w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=0SleEbr8I3SFEMz2Fic/zxpT83JtMeoQeJKyjm5bVbI=; b=6KktfEFiL+1zBZF30txrLxyyq0XqJjnY/BXHlT8iEQhKiti1i1NALt/JPjpSyu/72O d4FIAPtjVNnqKfj2IaZPOOGhnFC8QE3vLn30IGK2Z9sQaszKQd8Hl19cZP2S/WqYLnAn NAyAVfLWKG0yKq8VrMStxW0iykKi8LW1SMMf8lFEb0KbULpcG2yiNOGaChXpeQ4vNIZ4 CexgyONxwh6G/u1gS9qTK3CI229ahI7xJ6wM1Ath/hoXLw9eBbe8Z+kBYjdkafOSPb2b ex6moSYVAQVp/OxbeFS5gTz9Ps7y2/inUTAHamjqB6amwhwKezpc5EjrLOlToL2Q5vPb q1PQ== X-Gm-Message-State: AOAM531Q0QZIYL9K0901SuFGeUExkKF7XH/plf+FSYeBG217XKqz2Oah OxhlDw9RGIwrYHF0EZvId6jMReTYHTIqBXdbKwfF5J7f X-Google-Smtp-Source: ABdhPJz5RGlzLS+bFsOMoAJKX/7NvVAPGdnT9twWTxik0OF6AVjUFfOf8deCDmx/CssWCOswEGpmcf3HFStxkUEtaU0= X-Received: by 2002:a05:6638:2492:: with SMTP id x18mr5941385jat.164.1643731040073; Tue, 01 Feb 2022 07:57:20 -0800 (PST) MIME-Version: 1.0 References: <20220201150634.4076-1-jamrial@gmail.com> In-Reply-To: <20220201150634.4076-1-jamrial@gmail.com> From: "Ronald S. Bultje" Date: Tue, 1 Feb 2022 10:57:09 -0500 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: Re: [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 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: Hi, On Tue, Feb 1, 2022 at 10:07 AM James Almer wrote: > 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); > -- > 2.34.1 > LGTM. You could at your choice maybe mention that this fixes dav1d #383 and (the FFmpeg portion of) VLC #26259. Ronald _______________________________________________ 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".