RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

related to ticket4749

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

Conflicts:

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

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Emanuel Czirai 2015-08-03 00:58:46 +02:00 committed by Michael Niedermayer
parent cc0e35c441
commit 3d1cbf388d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/aacdec.c
View File

@ -3134,7 +3134,7 @@ static int aac_decode_frame(AVCodecContext *avctx, void *data,
if (INT_MAX / 8 <= buf_size) if (INT_MAX / 8 <= buf_size)
return AVERROR_INVALIDDATA; 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; return err;
switch (ac->oc[1].m4ac.object_type) { switch (ac->oc[1].m4ac.object_type) {