RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avfilter/avf_concat: Make independent of the channel layout 

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2016-09-06 01:13:52 +02:00
parent 4029f05c8b
commit 054f912c0d
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavfilter/avf_concat.c
View File

@ -260,7 +260,6 @@ static int send_silence(AVFilterContext *ctx, unsigned in_no, unsigned out_no,
int frame_nb_samples, ret; int frame_nb_samples, ret;
AVRational rate_tb = { 1, ctx->inputs[in_no]->sample_rate }; AVRational rate_tb = { 1, ctx->inputs[in_no]->sample_rate };
AVFrame *buf; AVFrame *buf;
int nb_channels = av_get_channel_layout_nb_channels(outlink->channel_layout);
if (!rate_tb.den) if (!rate_tb.den)
return AVERROR_BUG; return AVERROR_BUG;
@ -273,7 +272,7 @@ static int send_silence(AVFilterContext *ctx, unsigned in_no, unsigned out_no,
if (!buf) if (!buf)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
av_samples_set_silence(buf->extended_data, 0, frame_nb_samples, 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); buf->pts = base_pts + av_rescale_q(sent, rate_tb, outlink->time_base);
ret = ff_filter_frame(outlink, buf); ret = ff_filter_frame(outlink, buf);
if (ret < 0) if (ret < 0)