Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2019-07-03 15:42:54 +0300
committerPaul B Mahol <onemda@gmail.com>2019-07-03 15:54:05 +0300
commitd49d7d238f15021350c54e9c681e250464057cc3 (patch)
tree43e91496dfabd57ef7d6b2cc9fed131a5593d030 /libavfilter/vf_blend.c
parentd71dafb2abba7b2b506acc00137afa667e1e0440 (diff)
avfilter/vf_blend: use time_base from framesync
Fixes non-monotonous timestamps.
Diffstat (limited to 'libavfilter/vf_blend.c')
-rw-r--r--libavfilter/vf_blend.c8
1 files changed, 7 insertions, 1 deletions
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