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
release/0.6
Ramiro Polla 16 years ago
parent dd4090256c
commit 0091d8a164
  1. 2
      libavcodec/mlpdec.c

@ -508,7 +508,7 @@ static int read_matrix_params(MLPDecodeContext *m, SubStream *s, GetBitContext *
frac_bits = get_bits(gbp, 4); frac_bits = get_bits(gbp, 4);
s->lsb_bypass [mat] = get_bits1(gbp); 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, av_log(m->avctx, AV_LOG_ERROR,
"Invalid channel %d specified as output from matrix.\n", "Invalid channel %d specified as output from matrix.\n",
s->matrix_out_ch[mat]); s->matrix_out_ch[mat]);

Loading…
Cancel
Save