[FFmpeg-cvslog] libavcodec/aacdec_template: Use init_get_bits8() in aac_decode_frame()

Emanuel Czirai git at videolan.org
Thu Nov 19 11:27:46 CET 2015


ffmpeg | branch: release/2.6 | Emanuel Czirai <zazdxscf at gmail.com> | Mon Aug  3 00:58:46 2015 +0200| [ec328dc4618201d63c521049d351a162025de04b] | committer: Michael Niedermayer

libavcodec/aacdec_template: Use init_get_bits8() in aac_decode_frame()

related to ticket4749

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 7ab1c57a64b629455805d7fa74a8a20c689fc1f6)

Conflicts:

	libavcodec/aacdec_template.c
(cherry picked from commit dabb6dd98af52a22a922bca4a9196acf68b084dd)

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

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

diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 165ac84..2fb26ba 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -3148,7 +3148,7 @@ static int aac_decode_frame(AVCodecContext *avctx, void *data,
     if (INT_MAX / 8 <= buf_size)
         return AVERROR_INVALIDDATA;
 
-    if ((err = init_get_bits(&gb, buf, buf_size * 8)) < 0)
+    if ((err = init_get_bits8(&gb, buf, buf_size)) < 0)
         return err;
 
     switch (ac->oc[1].m4ac.object_type) {



More information about the ffmpeg-cvslog mailing list