[FFmpeg-cvslog] avfilter/vf_blend: use time_base from framesync

Paul B Mahol git at videolan.org
Wed Jul 3 15:55:37 EEST 2019


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Wed Jul  3 14:42:54 2019 +0200| [d49d7d238f15021350c54e9c681e250464057cc3] | committer: Paul B Mahol

avfilter/vf_blend: use time_base from framesync

Fixes non-monotonous timestamps.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d49d7d238f15021350c54e9c681e250464057cc3
---

 libavfilter/vf_blend.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c
index cf71200773..2f53cfa22a 100644
--- a/libavfilter/vf_blend.c
+++ b/libavfilter/vf_blend.c
@@ -694,7 +694,13 @@ static int config_output(AVFilterLink *outlink)
         }
     }
 
-    return s->tblend ? 0 : ff_framesync_configure(&s->fs);
+    if (s->tblend)
+        return 0;
+
+    ret = ff_framesync_configure(&s->fs);
+    outlink->time_base = s->fs.time_base;
+
+    return ret;
 }
 
 #if CONFIG_BLEND_FILTER



More information about the ffmpeg-cvslog mailing list