From ef7095cdc300247c5193c35d6c95e9ea58847e79 Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jean-marc.valin@usherbrooke.ca>
Date: Tue, 5 Jul 2011 15:48:20 -0400
Subject: [PATCH] More decoder corner case fixes

---
 src/opus_decoder.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/opus_decoder.c b/src/opus_decoder.c
index 079fca7b..7e32b097 100644
--- a/src/opus_decoder.c
+++ b/src/opus_decoder.c
@@ -328,6 +328,7 @@ static int opus_decode_frame(OpusDecoder *st, const unsigned char *data,
     /* 5 ms redundant frame for CELT->SILK*/
     if (redundancy && celt_to_silk)
     {
+        celt_decoder_ctl(celt_dec, CELT_SET_START_BAND(0));
         celt_decode(celt_dec, data+len, redundancy_bytes, redundant_audio, F5);
         celt_decoder_ctl(celt_dec, CELT_RESET_STATE);
     }
@@ -519,7 +520,7 @@ int opus_decode(OpusDecoder *st, const unsigned char *data,
 	for (i=0;i<count;i++)
 	{
 		int ret;
-		ret = opus_decode_frame(st, data, len, pcm, frame_size-nb_samples, decode_fec);
+		ret = opus_decode_frame(st, data, size[i], pcm, frame_size-nb_samples, decode_fec);
 		if (ret<0)
 			return ret;
 		data += size[i];