Fix RV40 chroma MC

[ffmpeg] / libavcodec / aac_parser.c

diff --git a/libavcodec/aac_parser.c b/libavcodec/aac_parser.c
index 2e4334f440537bfd2f0d85181b709cc7459fe09c..1d75e1e8595da8c489b50f9cc9ed1628464b76c6 100644 (file)
--- a/libavcodec/aac_parser.c
+++ b/libavcodec/aac_parser.c
@@ -27,12 +27,15 @@
 
 #define AAC_HEADER_SIZE 7
 
-static int aac_sync(AACAC3ParseContext *hdr_info, AACAC3FrameFlag *flag)
+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;
+    uint8_t tmp[8];
 
-    init_get_bits(&bits, hdr_info->inbuf, AAC_HEADER_SIZE * 8);
+    AV_WB64(tmp, state);
+    init_get_bits(&bits, tmp+8-AAC_HEADER_SIZE, AAC_HEADER_SIZE * 8);
 
     if(get_bits(&bits, 12) != 0xfff)
         return 0;
@@ -65,15 +68,15 @@ static int aac_sync(AACAC3ParseContext *hdr_info, AACAC3FrameFlag *flag)
     hdr_info->sample_rate = ff_mpeg4audio_sample_rates[sr];
     hdr_info->samples = (rdb + 1) * 1024;
     hdr_info->bit_rate = size * 8 * hdr_info->sample_rate / hdr_info->samples;
-    *flag = FRAME_COMPLETE;
 
+    *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;