From 1337de0c4bea8bbf8e142e8401edd0b25dd059b5 Mon Sep 17 00:00:00 2001
From: Justin Ruggles <justin.ruggles@gmail.com>
Date: Wed, 4 Apr 2012 10:47:45 -0400
Subject: [PATCH] avcodec: validate the channel layout vs. channel count for
 decoders

Set avctx->channel_layout to 0 if the channel count does not match
avctx->channels.
---
 libavcodec/utils.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index aa0f5b6d86..4037bfd327 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -810,6 +810,15 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, AVCodec *codec, AVD
             goto free_and_end;
         }
     }
+
+    if (av_codec_is_decoder(avctx->codec)) {
+        /* validate channel layout from the decoder */
+        if (avctx->channel_layout &&
+            av_get_channel_layout_nb_channels(avctx->channel_layout) != avctx->channels) {
+            av_log(avctx, AV_LOG_WARNING, "channel layout does not match number of channels\n");
+            avctx->channel_layout = 0;
+        }
+    }
 end:
     entangled_thread_counter--;