virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

lavfi/af_amerge: avfilter_copy_buffer_ref_props will overwrite output pts

Browse Source
This commit is contained in:
William Yu
2012-07-26 10:05:58 +02:00
committed by Nicolas George
parent 97c0d5357d
commit d5d5e3dabe
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavfilter/af_amerge.c
View File

@@ -241,13 +241,13 @@ static int filter_samples(AVFilterLink *inlink, AVFilterBufferRef *insamples)
ins[i] = inbuf[i]->data[0] + ins[i] = inbuf[i]->data[0] +
am->in[i].pos * am->in[i].nb_ch * am->bps; 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 : outbuf->pts = inbuf[0]->pts == AV_NOPTS_VALUE ? AV_NOPTS_VALUE :
inbuf[0]->pts + inbuf[0]->pts +
av_rescale_q(am->in[0].pos, av_rescale_q(am->in[0].pos,
(AVRational){ 1, ctx->inputs[0]->sample_rate }, (AVRational){ 1, ctx->inputs[0]->sample_rate },
ctx->outputs[0]->time_base); ctx->outputs[0]->time_base);
avfilter_copy_buffer_ref_props(outbuf, inbuf[0]);
outbuf->audio->nb_samples = nb_samples; outbuf->audio->nb_samples = nb_samples;
outbuf->audio->channel_layout = outlink->channel_layout; outbuf->audio->channel_layout = outlink->channel_layout;