X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Faf_afade.c;h=3a6266f0cd459b6f60b0c4f2cf50e80e4b1a011d;hb=85452f9ab7aaa6417e8c8b1b2eb285e7dce55a9c;hp=9acadc51c50353e1ece23d1b7f05f0728b0769a0;hpb=14bc8d6755aaff9073576aebdf12a4b50210eb0b;p=ffmpeg diff --git a/libavfilter/af_afade.c b/libavfilter/af_afade.c index 9acadc51c50..3a6266f0cd4 100644 --- a/libavfilter/af_afade.c +++ b/libavfilter/af_afade.c @@ -291,7 +291,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *buf) if ((!s->type && (cur_sample + nb_samples < s->start_sample)) || ( s->type && (s->start_sample + s->nb_samples < cur_sample))) { av_samples_set_silence(out_buf->extended_data, 0, nb_samples, - av_frame_get_channels(out_buf), out_buf->format); + out_buf->channels, out_buf->format); } else { int64_t start; @@ -301,7 +301,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *buf) start = s->start_sample + s->nb_samples - cur_sample; s->fade_samples(out_buf->extended_data, buf->extended_data, - nb_samples, av_frame_get_channels(buf), + nb_samples, buf->channels, s->type ? -1 : 1, start, s->nb_samples, s->curve); } @@ -498,7 +498,7 @@ static int acrossfade_filter_frame(AVFilterLink *inlink, AVFrame *in) s->crossfade_samples(out->extended_data, cf[0]->extended_data, cf[1]->extended_data, - s->nb_samples, av_frame_get_channels(in), + s->nb_samples, in->channels, s->curve, s->curve2); out->pts = s->pts; s->pts += av_rescale_q(s->nb_samples,