Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
* [FFmpeg-devel] [PATCH] avfilter/framesync: fix OOM case
@ 2023-11-27 12:07 Paul B Mahol
  2023-11-28 12:34 ` Paul B Mahol
  2023-11-29 17:50 ` Nicolas George
  0 siblings, 2 replies; 8+ messages in thread
From: Paul B Mahol @ 2023-11-27 12:07 UTC (permalink / raw)
  To: FFmpeg development discussions and patches

[-- Attachment #1: Type: text/plain, Size: 10 bytes --]

Attached.

[-- Attachment #2: 0001-avfilter-framesync-fix-OOM-case.patch --]
[-- Type: text/x-patch, Size: 968 bytes --]

From 8ce6bd0090666ef94b0455b7f8f4d3c05e273093 Mon Sep 17 00:00:00 2001
From: Paul B Mahol <onemda@gmail.com>
Date: Mon, 27 Nov 2023 13:04:16 +0100
Subject: [PATCH] avfilter/framesync: fix OOM case

Fixes OOM when caller keeps adding frames into filtergraph
that reached EOF by other means, for example EOF is signalled
by other filter in filtergraph or by buffersink.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
---
 libavfilter/framesync.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavfilter/framesync.c b/libavfilter/framesync.c
index 6cb4b21fed..23681b5183 100644
--- a/libavfilter/framesync.c
+++ b/libavfilter/framesync.c
@@ -354,8 +354,11 @@ static int consume_from_fifos(FFFrameSync *fs)
 
 int ff_framesync_activate(FFFrameSync *fs)
 {
+    AVFilterContext *ctx = fs->parent;
     int ret;
 
+    FF_FILTER_FORWARD_STATUS_BACK_ALL(ctx->outputs[0], ctx);
+
     ret = framesync_advance(fs);
     if (ret < 0)
         return ret;
-- 
2.42.1


[-- Attachment #3: Type: text/plain, Size: 251 bytes --]

_______________________________________________
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] 8+ messages in thread

end of thread, other threads:[~2023-11-29 17:50 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-11-27 12:07 [FFmpeg-devel] [PATCH] avfilter/framesync: fix OOM case Paul B Mahol
2023-11-28 12:34 ` Paul B Mahol
2023-11-28 12:32   ` Nicolas George
2023-11-28 13:04     ` Paul B Mahol
2023-11-28 15:52       ` Paul B Mahol
2023-11-28 16:01         ` Nicolas George
2023-11-28 16:41           ` Paul B Mahol
2023-11-29 17:50 ` Nicolas George

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