mlpdec: matrix_out_ch must not be greater than max_matrix_channel, and not max_channel.
authorRamiro Polla <ramiro.polla@gmail.com>
Sun, 5 Apr 2009 20:11:40 +0000 (20:11 +0000)
committerRamiro Polla <ramiro.polla@gmail.com>
Sun, 5 Apr 2009 20:11:40 +0000 (20:11 +0000)
Originally committed as revision 18335 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/mlpdec.c

index 6d148b4..8ec78b1 100644 (file)
@@ -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]);