Check that channel layout is compatible with number of channels for

output audio stream.

Originally committed as revision 18621 to svn://svn.ffmpeg.org/ffmpeg/trunk

1 files changed, 2 insertions, 0 deletions

diff --git a/ffmpeg.c b/ffmpeg.c
index 200d57dfef..c050512ae2 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3212,6 +3212,8 @@ static void new_audio_stream(AVFormatContext *oc)
         audio_enc->channels = audio_channels;
         audio_enc->sample_fmt = audio_sample_fmt;
         audio_enc->channel_layout = channel_layout;
+        if (avcodec_channel_layout_num_channels(channel_layout) != audio_channels)
+            audio_enc->channel_layout = 0;
 
         if(codec && codec->sample_fmts){
             const enum SampleFormat *p= codec->sample_fmts;