]> git.sesse.net Git - ffmpeg/commitdiff
avfilter/vf_blend: use time_base from framesync
authorPaul B Mahol <onemda@gmail.com>
Wed, 3 Jul 2019 12:42:54 +0000 (14:42 +0200)
committerPaul B Mahol <onemda@gmail.com>
Wed, 3 Jul 2019 12:54:05 +0000 (14:54 +0200)
Fixes non-monotonous timestamps.

libavfilter/vf_blend.c

index cf712007738f60d6b1e1b53511cf6b51e5aec95d..2f53cfa22a7e1612ca59d52ce8db5c9857c2ee66 100644 (file)
@@ -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