ffmpeg | branch: release/2.5 | Emanuel Czirai <zazdx...@gmail.com> | Mon Aug 3
00:58:46 2015 +0200| [3d1cbf388da79b203cdad9ca0046df33b47da476] | committer:
Michael Niedermayer
libavcodec/aacdec_template: Use init_get_bits8() in aac_decode_frame()
related to ticket4749
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
(cherry picked from commit 7ab1c57a64b629455805d7fa74a8a20c689fc1f6)
Conflicts:
libavcodec/aacdec_template.c
(cherry picked from commit dabb6dd98af52a22a922bca4a9196acf68b084dd)
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3d1cbf388da79b203cdad9ca0046df33b47da476
---
libavcodec/aacdec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 61efc25..44066f1 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -3134,7 +3134,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) {
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
