fix compilation with GCC-4.3+

[ffmpeg] / libavcodec / aac_parser.c

diff --git a/libavcodec/aac_parser.c b/libavcodec/aac_parser.c
index 8715ce6b753f19da391544e899ddced0afa8bb89..3ff14163dada38f058469b9e8be997dd5f2a0526 100644 (file)
--- a/libavcodec/aac_parser.c
+++ b/libavcodec/aac_parser.c
@@ -27,12 +27,18 @@
 
 #define AAC_HEADER_SIZE 7
 
-static int aac_sync(AACAC3ParseContext *hdr_info)
+static int aac_sync(uint64_t state, AACAC3ParseContext *hdr_info,
+        int *need_next_header, int *new_frame_start)
 {
     GetBitContext bits;
     int size, rdb, ch, sr;
+    union {
+        uint64_t u64;
+        uint8_t  u8[8];
+    } tmp;
 
-    init_get_bits(&bits, hdr_info->inbuf, AAC_HEADER_SIZE * 8);
+    tmp.u64 = be2me_64(state);
+    init_get_bits(&bits, tmp.u8+8-AAC_HEADER_SIZE, AAC_HEADER_SIZE * 8);
 
     if(get_bits(&bits, 12) != 0xfff)
         return 0;
@@ -66,13 +72,14 @@ static int aac_sync(AACAC3ParseContext *hdr_info)
     hdr_info->samples = (rdb + 1) * 1024;
     hdr_info->bit_rate = size * 8 * hdr_info->sample_rate / hdr_info->samples;
 
+    *need_next_header = 0;
+    *new_frame_start  = 1;
     return size;
 }
 
 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;