From d5d5e3dabe017f0a962766896f9375363edde3a3 Mon Sep 17 00:00:00 2001 From: William Yu Date: Thu, 26 Jul 2012 10:05:58 +0200 Subject: lavfi/af_amerge: avfilter_copy_buffer_ref_props will overwrite output pts --- libavfilter/af_amerge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavfilter/af_amerge.c') diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c index b810f73b38..55269f6046 100644 --- a/libavfilter/af_amerge.c +++ b/libavfilter/af_amerge.c @@ -241,13 +241,13 @@ static int filter_samples(AVFilterLink *inlink, AVFilterBufferRef *insamples) ins[i] = inbuf[i]->data[0] + am->in[i].pos * am->in[i].nb_ch * am->bps; } + avfilter_copy_buffer_ref_props(outbuf, inbuf[0]); outbuf->pts = inbuf[0]->pts == AV_NOPTS_VALUE ? AV_NOPTS_VALUE : inbuf[0]->pts + av_rescale_q(am->in[0].pos, (AVRational){ 1, ctx->inputs[0]->sample_rate }, ctx->outputs[0]->time_base); - avfilter_copy_buffer_ref_props(outbuf, inbuf[0]); outbuf->audio->nb_samples = nb_samples; outbuf->audio->channel_layout = outlink->channel_layout; -- cgit v1.2.3