[FFmpeg-cvslog] af_channelmap: fix number of channels

Marton Balint git at videolan.org
Sat Mar 28 11:36:29 CET 2015


ffmpeg | branch: master | Marton Balint <cus at passwd.hu> | Sat Mar 28 10:07:07 2015 +0100| [625bd463cde81244169bce99d3afc0b3c73304c2] | committer: Michael Niedermayer

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 at passwd.hu>
Reviewed-by: Marton Balint <cus at passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=625bd463cde81244169bce99d3afc0b3c73304c2
---

 libavfilter/af_channelmap.c |    1 +
 1 file changed, 1 insertion(+)

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);
 }



More information about the ffmpeg-cvslog mailing list