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

lavfi/asetnsamples: unbreak for >8 channels 

Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2013-07-13 21:59:13 +00:00
parent e9678631f1
commit 729709b890
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavfilter/af_asetnsamples.c
View File

@ -73,9 +73,8 @@ static av_cold void uninit(AVFilterContext *ctx)
static int config_props_output(AVFilterLink *outlink) static int config_props_output(AVFilterLink *outlink)
{ {
ASNSContext *asns = outlink->src->priv; ASNSContext *asns = outlink->src->priv;
int nb_channels = av_get_channel_layout_nb_channels(outlink->channel_layout);
asns->fifo = av_audio_fifo_alloc(outlink->format, nb_channels, asns->nb_out_samples); asns->fifo = av_audio_fifo_alloc(outlink->format, outlink->channels, asns->nb_out_samples);
if (!asns->fifo) if (!asns->fifo)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
outlink->flags |= FF_LINK_FLAG_REQUEST_LOOP; outlink->flags |= FF_LINK_FLAG_REQUEST_LOOP;
@ -109,7 +108,7 @@ static int push_samples(AVFilterLink *outlink)
if (nb_pad_samples) if (nb_pad_samples)
av_samples_set_silence(outsamples->extended_data, nb_out_samples - nb_pad_samples, av_samples_set_silence(outsamples->extended_data, nb_out_samples - nb_pad_samples,
nb_pad_samples, av_get_channel_layout_nb_channels(outlink->channel_layout), nb_pad_samples, outlink->channels,
outlink->format); outlink->format);
outsamples->nb_samples = nb_out_samples; outsamples->nb_samples = nb_out_samples;
outsamples->channel_layout = outlink->channel_layout; outsamples->channel_layout = outlink->channel_layout;