[FFmpeg-devel] [PATCH] avcodec/libdav1d: free the Dav1dData packet on dav1d_send_data() failure
Ronald S. Bultje
rsbultje at gmail.com
Tue Feb 1 17:57:09 EET 2022
Hi,
On Tue, Feb 1, 2022 at 10:07 AM James Almer <jamrial at gmail.com> wrote:
> We still own it on failure, and there's no point trying to feed it again.
>
> Signed-off-by: James Almer <jamrial at gmail.com>
> ---
> 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
More information about the ffmpeg-devel
mailing list