|
|
|
@ -2392,7 +2392,7 @@ static int parse_adts_frame_header(AACContext *ac, GetBitContext *gb) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
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; |
|
|
|
|
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); |
|
|
|
|
|
|
|
|
|
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; |
|
|
|
|
|
|
|
|
|
buf_consumed = (get_bits_count(&gb) + 7) >> 3; |
|
|
|
@ -2864,7 +2864,7 @@ static int latm_decode_frame(AVCodecContext *avctx, void *out, |
|
|
|
|
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 muxlength; |
|
|
|
|