diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-09-06 01:13:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-09-10 23:19:01 +0200 |
| commit | 054f912c0d73c54625a0b186e597f7db82b563fb (patch) | |
| tree | aaaa3f6cbf65f450c73100a0ec2be7f49e631355 /libavfilter | |
| parent | 4029f05c8b0943a5446f254142d5e2bfedb50a0d (diff) | |
| download | ffmpeg-054f912c0d73c54625a0b186e597f7db82b563fb.tar.gz | |
avfilter/avf_concat: Make independent of the channel layout
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/avf_concat.c | 3 |
1 files changed, 1 insertions, 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) |