X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Faf_amultiply.c;h=cc032846fab7778e4403b952f385f9baabeb6aa5;hb=5d9af1670ef2be16722f2ce8c9d8365bfbcaca23;hp=b35eca725002adb9e66be6d917b256592bfcb979;hpb=bad70b7af6b909691f5389e14eb7d0c03db10af9;p=ffmpeg diff --git a/libavfilter/af_amultiply.c b/libavfilter/af_amultiply.c index b35eca72500..cc032846fab 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++) {