From 454064ad1eb39ffbea4906dbe2e246e18a5d5d67 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 19 Apr 2008 01:50:40 +0000 Subject: Change aac and ac3 parsers to use ff_combine_frame(). Originally committed as revision 12894 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/aac_parser.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libavcodec/aac_parser.c') diff --git a/libavcodec/aac_parser.c b/libavcodec/aac_parser.c index 8715ce6b75..a2e95f7bb1 100644 --- a/libavcodec/aac_parser.c +++ b/libavcodec/aac_parser.c @@ -27,12 +27,13 @@ #define AAC_HEADER_SIZE 7 -static int aac_sync(AACAC3ParseContext *hdr_info) +static int aac_sync(uint64_t state, AACAC3ParseContext *hdr_info) { GetBitContext bits; int size, rdb, ch, sr; + uint64_t tmp = be2me_64(state); - init_get_bits(&bits, hdr_info->inbuf, AAC_HEADER_SIZE * 8); + init_get_bits(&bits, ((uint8_t *)&tmp)+8-AAC_HEADER_SIZE, AAC_HEADER_SIZE * 8); if(get_bits(&bits, 12) != 0xfff) return 0; @@ -72,7 +73,6 @@ static int aac_sync(AACAC3ParseContext *hdr_info) static av_cold int aac_parse_init(AVCodecParserContext *s1) { AACAC3ParseContext *s = s1->priv_data; - s->inbuf_ptr = s->inbuf; s->header_size = AAC_HEADER_SIZE; s->sync = aac_sync; return 0; -- cgit v1.2.3