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/ac3_parser.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libavcodec/ac3_parser.c') diff --git a/libavcodec/ac3_parser.c b/libavcodec/ac3_parser.c index bc728c19da..511223398c 100644 --- a/libavcodec/ac3_parser.c +++ b/libavcodec/ac3_parser.c @@ -123,12 +123,13 @@ int ff_ac3_parse_header(const uint8_t buf[7], AC3HeaderInfo *hdr) return 0; } -static int ac3_sync(AACAC3ParseContext *hdr_info) +static int ac3_sync(uint64_t state, AACAC3ParseContext *hdr_info) { int err; + uint64_t tmp = be2me_64(state); AC3HeaderInfo hdr; - err = ff_ac3_parse_header(hdr_info->inbuf, &hdr); + err = ff_ac3_parse_header(((uint8_t *)&tmp)+8-AC3_HEADER_SIZE, &hdr); if(err < 0) return 0; @@ -144,7 +145,6 @@ static int ac3_sync(AACAC3ParseContext *hdr_info) static av_cold int ac3_parse_init(AVCodecParserContext *s1) { AACAC3ParseContext *s = s1->priv_data; - s->inbuf_ptr = s->inbuf; s->header_size = AC3_HEADER_SIZE; s->sync = ac3_sync; return 0; -- cgit v1.2.3