[FFmpeg-cvslog] avcodec/libdav1d: free the Dav1dData packet on dav1d_send_data() failure
James Almer
git at videolan.org
Tue Feb 1 18:06:37 EET 2022
ffmpeg | branch: release/4.4 | James Almer <jamrial at gmail.com> | Tue Feb 1 12:06:14 2022 -0300| [a4e1dd694014bd9314f63ddebc52ff2495c4f616] | committer: James Almer
avcodec/libdav1d: free the Dav1dData packet on dav1d_send_data() failure
We still own it on failure, and there's no point trying to feed it again.
This should address the issue reported in dav1d #383 and part of VLC #26259.
Signed-off-by: James Almer <jamrial at gmail.com>
Reviewed-by: Ronald S. Bultje <rsbultje at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a4e1dd694014bd9314f63ddebc52ff2495c4f616
---
libavcodec/libdav1d.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c
index 305e04cef7..a9b57f526d 100644
--- a/libavcodec/libdav1d.c
+++ b/libavcodec/libdav1d.c
@@ -248,8 +248,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);
More information about the ffmpeg-cvslog
mailing list