From d1d9b0813a2a7e304cc29dba3b1380857d0f9816 Mon Sep 17 00:00:00 2001 From: James Almer Date: Fri, 27 Dec 2024 19:11:47 -0300 Subject: [PATCH] avcodec/libdav1d: clear the buffered Dav1dData on decoding failure Should ensure avcodec_send_packet() doesn't return EAGAIN in scenarios where it's not meant to (e.g., ffmpeg_dec.c where avcodec_receive_frame() is called in a loop to drain all produced frames before trying to submit more packets). Fixes ticket #11377. Reviewed-by: Ronald S. Bultje Signed-off-by: James Almer --- libavcodec/libdav1d.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index 546b42e9c6..ff67f44bd3 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -372,9 +372,10 @@ static int libdav1d_receive_frame_internal(AVCodecContext *c, Dav1dPicture *p) res = dav1d_get_picture(dav1d->c, p); if (res < 0) { - if (res == AVERROR(EINVAL)) + if (res == AVERROR(EINVAL)) { + dav1d_data_unref(data); res = AVERROR_INVALIDDATA; - else if (res == AVERROR(EAGAIN)) + } else if (res == AVERROR(EAGAIN)) res = c->internal->draining ? AVERROR_EOF : 1; }