summaryrefslogtreecommitdiff
path: root/libavfilter/avf_concat.c
diff options
context:
space:
mode:
authorNicolas George <nicolas.george@normalesup.org>2012-07-28 14:57:52 +0200
committerNicolas George <nicolas.george@normalesup.org>2012-07-28 15:14:01 +0200
commitefcfcf8793a64525536e809e04f952ebed719b28 (patch)
tree14f3caac6049148aed85f0d3e14b642ae4cd5641 /libavfilter/avf_concat.c
parent4ce87ecf2a8a8a9348f9bdbb420f3bee92e6513f (diff)
downloadffmpeg-efcfcf8793a64525536e809e04f952ebed719b28.tar.gz
avf_concat: fix silence duration.
concat_in.pts starts at 0 for each segment, so the duration of the silence was too long, except at the first stitch.
Diffstat (limited to 'libavfilter/avf_concat.c')
-rw-r--r--libavfilter/avf_concat.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/avf_concat.c b/libavfilter/avf_concat.c
index 005e4147aa..6b4fffa19f 100644
--- a/libavfilter/avf_concat.c
+++ b/libavfilter/avf_concat.c
@@ -269,7 +269,7 @@ static void send_silence(AVFilterContext *ctx, unsigned in_no, unsigned out_no)
{
ConcatContext *cat = ctx->priv;
AVFilterLink *outlink = ctx->outputs[out_no];
- int64_t base_pts = cat->in[in_no].pts;
+ int64_t base_pts = cat->in[in_no].pts + cat->delta_ts;
int64_t nb_samples, sent = 0;
int frame_nb_samples;
AVRational rate_tb = { 1, ctx->inputs[in_no]->sample_rate };