From 0091d8a1643e497706cef80b1e6a7a171c3fbf24 Mon Sep 17 00:00:00 2001
From: Ramiro Polla <ramiro.polla@gmail.com>
Date: Sun, 5 Apr 2009 20:11:40 +0000
Subject: [PATCH] mlpdec: matrix_out_ch must not be greater than
 max_matrix_channel, and not max_channel.

Originally committed as revision 18335 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/mlpdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c
index 6d148b4735..8ec78b101d 100644
--- a/libavcodec/mlpdec.c
+++ b/libavcodec/mlpdec.c
@@ -508,7 +508,7 @@ static int read_matrix_params(MLPDecodeContext *m, SubStream *s, GetBitContext *
         frac_bits             = get_bits(gbp, 4);
         s->lsb_bypass   [mat] = get_bits1(gbp);
 
-        if (s->matrix_out_ch[mat] > s->max_channel) {
+        if (s->matrix_out_ch[mat] > s->max_matrix_channel) {
             av_log(m->avctx, AV_LOG_ERROR,
                     "Invalid channel %d specified as output from matrix.\n",
                     s->matrix_out_ch[mat]);