ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Tue Sep 6 01:13:52 2016 +0200| [054f912c0d73c54625a0b186e597f7db82b563fb] | committer: Michael Niedermayer
avfilter/avf_concat: Make independent of the channel layout Reviewed-by: Nicolas George <geo...@nsup.org> Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=054f912c0d73c54625a0b186e597f7db82b563fb --- 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 4fa9447..56e4179 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) _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
