ffmpeg | branch: master | Paul B Mahol <one...@gmail.com> | Sat May 4 11:28:14 2019 +0200| [e94447cd49e117aef26cc46c23c54d38eea56d5f] | committer: Paul B Mahol
avfilter/af_amultiply: use pts from frame from first input > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e94447cd49e117aef26cc46c23c54d38eea56d5f --- libavfilter/af_amultiply.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/libavfilter/af_amultiply.c b/libavfilter/af_amultiply.c index b35eca7250..cc032846fa 100644 --- a/libavfilter/af_amultiply.c +++ b/libavfilter/af_amultiply.c @@ -34,7 +34,6 @@ typedef struct AudioMultiplyContext { const AVClass *class; AVFrame *frames[2]; - int64_t pts; int planes; int channels; int samples_align; @@ -95,21 +94,20 @@ static int activate(AVFilterContext *ctx) } } - if (nb_samples > 0 && s->frames[0] && s->frames[1]) { + if (s->frames[0] && s->frames[1]) { AVFrame *out; int plane_samples; if (av_sample_fmt_is_planar(ctx->inputs[0]->format)) - plane_samples = FFALIGN(nb_samples, s->samples_align); + plane_samples = FFALIGN(s->frames[0]->nb_samples, s->samples_align); else - plane_samples = FFALIGN(nb_samples * s->channels, s->samples_align); + plane_samples = FFALIGN(s->frames[0]->nb_samples * s->channels, s->samples_align); - out = ff_get_audio_buffer(ctx->outputs[0], nb_samples); + out = ff_get_audio_buffer(ctx->outputs[0], s->frames[0]->nb_samples); if (!out) return AVERROR(ENOMEM); - out->pts = s->pts; - s->pts += nb_samples; + out->pts = s->frames[0]->pts; if (av_get_packed_sample_fmt(ctx->inputs[0]->format) == AV_SAMPLE_FMT_FLT) { for (i = 0; i < s->planes; i++) { _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
