diff mbox series

[FFmpeg-devel,2/2] lavfi/vf_fps: check flow before sending more frames

Message ID 20220219160137.2806285-2-george@nsup.org
State Accepted
Commit 01440e258827f77990d918bfeb77cb613bc3733a
Headers show
Series [FFmpeg-devel,1/2] lavfi: add ff_inoutlink_check_flow() | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_aarch64_jetson success Make finished
andriy/make_fate_aarch64_jetson success Make fate finished
andriy/make_armv7_RPi4 success Make finished
andriy/make_fate_armv7_RPi4 success Make fate finished

Commit Message

Nicolas George Feb. 19, 2022, 4:01 p.m. UTC
Analyzed by Paul B Mahol <onemda@gmail.com>.

Fixes OOM in #9081.

Signed-off-by: Nicolas George <george@nsup.org>
---
 libavfilter/vf_fps.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/libavfilter/vf_fps.c b/libavfilter/vf_fps.c
index 99e679441e..0e5a1fec35 100644
--- a/libavfilter/vf_fps.c
+++ b/libavfilter/vf_fps.c
@@ -351,7 +351,7 @@  static int activate(AVFilterContext *ctx)
     if (s->frames_count > 0) {
         ret = write_frame(ctx, s, outlink, &again);
         /* Couldn't generate a frame, so schedule us to perform another step */
-        if (again)
+        if (again && ff_inoutlink_check_flow(inlink, outlink))
             ff_filter_set_ready(ctx, 100);
         return ret;
     }