cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FFmpeg: add bug fix from the 4.4 branch, from Brad

Browse Source 
avcodec/libdav1d: free the Dav1dData packet on dav1d_send_data() failure
This commit is contained in:
sthen 2022-03-20 09:50:15 +00:00
parent 1d5036f159
commit 6ac6a54c21
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
graphics/ffmpeg/Makefile
View File

@ -2,7 +2,7 @@ COMMENT= audio/video converter and streamer
V= 4.4.1
DISTNAME= ffmpeg-${V}
REVISION= 2
REVISION= 3
EPOCH= 1
CATEGORIES= graphics multimedia
MASTER_SITES= https://ffmpeg.org/releases/

13
graphics/ffmpeg/patches/patch-libavcodec_libdav1d_c
View File

@ -1,5 +1,6 @@
- avcodec/libdav1d: pass auto threads value to libdav1d
- avcodec/libdav1d: let libdav1d choose optimal max frame delay
- avcodec/libdav1d: free the Dav1dData packet on dav1d_send_data() failure
Index: libavcodec/libdav1d.c
--- libavcodec/libdav1d.c.orig
@ -25,3 +26,15 @@ Index: libavcodec/libdav1d.c
av_log(c, AV_LOG_DEBUG, "Using %d threads, %d max_frame_delay\n",
s.n_threads, s.max_frame_delay);
#else
@@ -244,8 +248,10 @@ static int libdav1d_receive_frame(AVCodecContext *c, A
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);