[FFmpeg-cvslog] aacdec: pass AVPacket to aac_decode_frame_int()
Michael Niedermayer
git at videolan.org
Thu Aug 30 00:29:15 CEST 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug 30 00:12:49 2012 +0200| [0fc684ff7c8281b252556a94e58271b12e9e6080] | committer: Michael Niedermayer
aacdec: pass AVPacket to aac_decode_frame_int()
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0fc684ff7c8281b252556a94e58271b12e9e6080
---
libavcodec/aacdec.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index df2a494..ee6b112 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -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;
More information about the ffmpeg-cvslog
mailing list