virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-19 09:02:26 +02:00
Code Issues Releases Activity

aacdec: pass AVPacket to aac_decode_frame_int()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-08-30 00:12:49 +02:00
parent 818f3dc907
commit 0fc684ff7c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/aacdec.c
View File

@ -2392,7 +2392,7 @@ static int parse_adts_frame_header(AACContext *ac, GetBitContext *gb)
} }
static int aac_decode_frame_int(AVCodecContext *avctx, void *data, static int aac_decode_frame_int(AVCodecContext *avctx, void *data,
int *got_frame_ptr, GetBitContext *gb) int *got_frame_ptr, GetBitContext *gb, AVPacket *avpkt)
{ {
AACContext *ac = avctx->priv_data; AACContext *ac = avctx->priv_data;
ChannelElement *che = NULL, *che_prev = NULL; ChannelElement *che = NULL, *che_prev = NULL;
@ -2579,7 +2579,7 @@ static int aac_decode_frame(AVCodecContext *avctx, void *data,
init_get_bits(&gb, buf, buf_size * 8); init_get_bits(&gb, buf, buf_size * 8);
if ((err = aac_decode_frame_int(avctx, data, got_frame_ptr, &gb)) < 0) if ((err = aac_decode_frame_int(avctx, data, got_frame_ptr, &gb, avpkt)) < 0)
return err; return err;
buf_consumed = (get_bits_count(&gb) + 7) >> 3; buf_consumed = (get_bits_count(&gb) + 7) >> 3;
@ -2864,7 +2864,7 @@ static int latm_decode_frame(AVCodecContext *avctx, void *out,
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if ((err = aac_decode_frame_int(avctx, out, got_frame_ptr, &gb)) < 0) if ((err = aac_decode_frame_int(avctx, out, got_frame_ptr, &gb, avpkt)) < 0)
return err; return err;
return muxlength; return muxlength;