[FFmpeg-cvslog] mpc8: fix maximum bands handling

[Kostya Shishkov]

ffmpeg | branch: release/0.11 | Kostya Shishkov <kostya.shishkov at gmail.com> | Mon Jun  4 08:01:34 2012 +0200| [7d979364953c7c8b2db5083627f6111cbaaf4ac0] | committer: Michael Niedermayer

mpc8: fix maximum bands handling

In Musepack SV8 codec property tell the maximum nonzero band, but every
frame codes maximum band as a limit (i.e. strictly less than given value).
Synthesis also expects maximum nonzero band, so there's a need to convert
frame maximum band limit value.
(cherry picked from commit b56825c40ee1329b33aed34ff8a639fa18d263a0)

Conflicts:

	libavcodec/mpc8.c

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7d979364953c7c8b2db5083627f6111cbaaf4ac0
---

 libavcodec/mpc8.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libavcodec/mpc8.c b/libavcodec/mpc8.c
index 652e824..3970761 100644
--- a/libavcodec/mpc8.c
+++ b/libavcodec/mpc8.c
@@ -275,7 +275,7 @@ static int mpc8_decode_frame(AVCodecContext * avctx, void *data,
         maxband = c->last_max_band + get_vlc2(gb, band_vlc.table, MPC8_BANDS_BITS, 2);
         if(maxband > 32) maxband -= 33;
     }
-    if(maxband >= BANDS) {
+    if(maxband > c->maxbands + 1) {
         av_log(avctx, AV_LOG_ERROR, "maxband %d too large\n",maxband);
         return AVERROR_INVALIDDATA;
     }
@@ -412,7 +412,8 @@ static int mpc8_decode_frame(AVCodecContext * avctx, void *data,
         }
     }
 
-    ff_mpc_dequantize_and_synth(c, maxband, c->frame.data[0], avctx->channels);
+    ff_mpc_dequantize_and_synth(c, maxband - 1, c->frame.data[0],
+                                avctx->channels);
 
     c->cur_frame++;