aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarton Balint <cus@passwd.hu>2020-12-20 19:32:56 +0100
committerMarton Balint <cus@passwd.hu>2020-12-27 11:01:41 +0100
commit6d3b70c27ef1639784fdb3382e5a06b1afa3fe3e (patch)
tree3972322edcec7440bf9b42b177437f68966e41e5
parentbff6fbead81498525ef1366bb5bff31a2c737db5 (diff)
downloadffmpeg-6d3b70c27ef1639784fdb3382e5a06b1afa3fe3e.tar.gz
avfilter/vf_framerate: fix infinite loop with 1-frame input
Fixes infinite loop in: ffmpeg -f lavfi -i testsrc=d=0.04 -vf framerate=50 -f null none Signed-off-by: Marton Balint <cus@passwd.hu>
-rw-r--r--libavfilter/vf_framerate.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavfilter/vf_framerate.c b/libavfilter/vf_framerate.c
index 6c8d01c94b..f5085705a4 100644
--- a/libavfilter/vf_framerate.c
+++ b/libavfilter/vf_framerate.c
@@ -170,7 +170,9 @@ static int process_work_frame(AVFilterContext *ctx)
return 0;
if (!s->f0) {
- s->work = av_frame_clone(s->f1);
+ av_assert1(s->flush);
+ s->work = s->f1;
+ s->f1 = NULL;
} else {
if (work_pts >= s->pts1 + s->delta && s->flush)
return 0;