From 054f912c0d73c54625a0b186e597f7db82b563fb Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 6 Sep 2016 01:13:52 +0200 Subject: [PATCH] avfilter/avf_concat: Make independent of the channel layout Reviewed-by: Nicolas George Signed-off-by: Michael Niedermayer --- libavfilter/avf_concat.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavfilter/avf_concat.c b/libavfilter/avf_concat.c index 4fa944766e..56e41792a7 100644 --- a/libavfilter/avf_concat.c +++ b/libavfilter/avf_concat.c @@ -260,7 +260,6 @@ static int send_silence(AVFilterContext *ctx, unsigned in_no, unsigned out_no, int frame_nb_samples, ret; AVRational rate_tb = { 1, ctx->inputs[in_no]->sample_rate }; AVFrame *buf; - int nb_channels = av_get_channel_layout_nb_channels(outlink->channel_layout); if (!rate_tb.den) return AVERROR_BUG; @@ -273,7 +272,7 @@ static int send_silence(AVFilterContext *ctx, unsigned in_no, unsigned out_no, if (!buf) return AVERROR(ENOMEM); av_samples_set_silence(buf->extended_data, 0, frame_nb_samples, - nb_channels, outlink->format); + outlink->channels, outlink->format); buf->pts = base_pts + av_rescale_q(sent, rate_tb, outlink->time_base); ret = ff_filter_frame(outlink, buf); if (ret < 0)