[FFmpeg-cvslog] atrac3: set the getbits context the right buffer_end

Luca Barbato git at videolan.org
Sat Sep 14 11:36:43 CEST 2013


ffmpeg | branch: release/0.10 | Luca Barbato <lu_zero at gentoo.org> | Tue Jul  9 04:20:23 2013 +0200| [e06623c48030530b50f00cee26f1a3a33c4b4d4b] | committer: Luca Barbato

atrac3: set the getbits context the right buffer_end

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable at libav.org
(cherry picked from commit 22e76ec635bafdd1d1ec35581a7ac09e69e3c43e)

Signed-off-by: Luca Barbato <lu_zero at gentoo.org>

Conflicts:
	libavcodec/atrac3.c

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

 libavcodec/atrac3.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c
index e0702a9..cc0cc7c 100644
--- a/libavcodec/atrac3.c
+++ b/libavcodec/atrac3.c
@@ -773,7 +773,7 @@ static int decodeFrame(ATRAC3Context *q, const uint8_t* databuf,
 
 
         /* set the bitstream reader at the start of the second Sound Unit*/
-        init_get_bits(&q->gb,ptr1,q->bits_per_frame);
+        init_get_bits(&q->gb, ptr1, (q->bytes_per_frame - i) * 8);
 
         /* Fill the Weighting coeffs delay buffer */
         memmove(q->weighting_delay,&(q->weighting_delay[2]),4*sizeof(int));



More information about the ffmpeg-cvslog mailing list