diff options
| author | William Yu <genwillyu@gmail.com> | 2012-07-26 10:05:58 +0200 |
|---|---|---|
| committer | Nicolas George <nicolas.george@normalesup.org> | 2012-07-26 10:05:58 +0200 |
| commit | d5d5e3dabe017f0a962766896f9375363edde3a3 (patch) | |
| tree | 3a6e1412c48dfd5a65597a4622c2377293d5eecf /libavfilter/af_amerge.c | |
| parent | 97c0d5357d9cdb4fd18920a76444cca2ec1a9cd5 (diff) | |
| download | ffmpeg-d5d5e3dabe017f0a962766896f9375363edde3a3.tar.gz | |
lavfi/af_amerge: avfilter_copy_buffer_ref_props will overwrite output pts
Diffstat (limited to 'libavfilter/af_amerge.c')
| -rw-r--r-- | libavfilter/af_amerge.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |