diff aac_parser.c @ 6642:866b9ade048c libavcodec

Change aac and ac3 parsers to use ff_combine_frame().
author michael
date Sat, 19 Apr 2008 01:50:40 +0000
parents 1980eba5fd0e
children 4d04fcb5e1e4
line wrap: on
line diff
--- a/aac_parser.c	Fri Apr 18 08:58:18 2008 +0000
+++ b/aac_parser.c	Sat Apr 19 01:50:40 2008 +0000
@@ -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 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;