[FFmpeg-cvslog] lavfi/af_amerge: avfilter_copy_buffer_ref_props will overwrite output pts

[William Yu]

ffmpeg | branch: master | William Yu <genwillyu at gmail.com> | Thu Jul 26 10:05:58 2012 +0200| [d5d5e3dabe017f0a962766896f9375363edde3a3] | committer: Nicolas George

lavfi/af_amerge: avfilter_copy_buffer_ref_props will overwrite output pts

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

 libavfilter/af_amerge.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c
index b810f73..55269f6 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;