summaryrefslogtreecommitdiffstats
path: root/libavfilter
diff options
context:
space:
mode:
authorMarton Balint <cus@passwd.hu>2015-03-28 10:07:07 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-03-28 11:16:26 +0100
commit625bd463cde81244169bce99d3afc0b3c73304c2 (patch)
treed287e472be40ba3ec647b8f50246b2b6e7cde411 /libavfilter
parent048b6331e079e73efe397fb52510776519f830e4 (diff)
downloadffmpeg-streaming-625bd463cde81244169bce99d3afc0b3c73304c2.zip
ffmpeg-streaming-625bd463cde81244169bce99d3afc0b3c73304c2.tar.gz
af_channelmap: fix number of channels
Fixes segfaults with the following command: ffmpeg -f lavfi -i aevalsrc=0:c=stereo:n=1920 -af 'channelmap=0' test.ac3 Signed-off-by: Marton Balint <cus@passwd.hu> Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
-rw-r--r--libavfilter/af_channelmap.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavfilter/af_channelmap.c b/libavfilter/af_channelmap.c
index cc66f04..f8289cc 100644
--- a/libavfilter/af_channelmap.c
+++ b/libavfilter/af_channelmap.c
@@ -348,6 +348,7 @@ static int channelmap_filter_frame(AVFilterLink *inlink, AVFrame *buf)
FFMIN(FF_ARRAY_ELEMS(buf->data), nch_out) * sizeof(buf->data[0]));
buf->channel_layout = outlink->channel_layout;
+ av_frame_set_channels(buf, outlink->channels);
return ff_filter_frame(outlink, buf);
}
OpenPOWER on IntegriCloud