* [FFmpeg-devel] [PATCH] avcodec/libdav1d: free the Dav1dData packet on dav1d_send_data() failure
@ 2022-02-01 15:06 James Almer
2022-02-01 15:57 ` Ronald S. Bultje
0 siblings, 1 reply; 3+ messages in thread
From: James Almer @ 2022-02-01 15:06 UTC (permalink / raw)
To: ffmpeg-devel
We still own it on failure, and there's no point trying to feed it again.
Signed-off-by: James Almer <jamrial@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
_______________________________________________
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".
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [FFmpeg-devel] [PATCH] avcodec/libdav1d: free the Dav1dData packet on dav1d_send_data() failure
2022-02-01 15:06 [FFmpeg-devel] [PATCH] avcodec/libdav1d: free the Dav1dData packet on dav1d_send_data() failure James Almer
@ 2022-02-01 15:57 ` Ronald S. Bultje
2022-02-01 16:07 ` James Almer
0 siblings, 1 reply; 3+ messages in thread
From: Ronald S. Bultje @ 2022-02-01 15:57 UTC (permalink / raw)
To: FFmpeg development discussions and patches
Hi,
On Tue, Feb 1, 2022 at 10:07 AM James Almer <jamrial@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@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
_______________________________________________
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".
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [FFmpeg-devel] [PATCH] avcodec/libdav1d: free the Dav1dData packet on dav1d_send_data() failure
2022-02-01 15:57 ` Ronald S. Bultje
@ 2022-02-01 16:07 ` James Almer
0 siblings, 0 replies; 3+ messages in thread
From: James Almer @ 2022-02-01 16:07 UTC (permalink / raw)
To: ffmpeg-devel
On 2/1/2022 12:57 PM, Ronald S. Bultje wrote:
> Hi,
>
> On Tue, Feb 1, 2022 at 10:07 AM James Almer <jamrial@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@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.
Added that, applied and backported.
Thanks.
>
> 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".
_______________________________________________
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".
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-02-01 16:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-01 15:06 [FFmpeg-devel] [PATCH] avcodec/libdav1d: free the Dav1dData packet on dav1d_send_data() failure James Almer
2022-02-01 15:57 ` Ronald S. Bultje
2022-02-01 16:07 ` James Almer
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git