X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Faac_parser.c;h=b8692625f3f61d49ae56a0fd8aad0aa24e63a096;hb=2b739e1cb8f6ce8baead03ce5c999103ba78f24f;hp=0b868edcb25213293ab9d4c591887e6706c0fec6;hpb=21525e6d0d704e88e69eda9dc4c92a4acee347ac;p=ffmpeg

diff --git a/libavcodec/aac_parser.c b/libavcodec/aac_parser.c
index 0b868edcb25..b8692625f3f 100644
--- a/libavcodec/aac_parser.c
+++ b/libavcodec/aac_parser.c
@@ -22,7 +22,8 @@
 
 #include "parser.h"
 #include "aac_ac3_parser.h"
-#include "aacadtsdec.h"
+#include "adts_header.h"
+#include "adts_parser.h"
 #include "get_bits.h"
 #include "mpeg4audio.h"
 
@@ -38,9 +39,10 @@ static int aac_sync(uint64_t state, AACAC3ParseContext *hdr_info,
     } tmp;
 
     tmp.u64 = av_be2ne64(state);
-    init_get_bits(&bits, tmp.u8+8-AAC_ADTS_HEADER_SIZE, AAC_ADTS_HEADER_SIZE * 8);
+    init_get_bits(&bits, tmp.u8 + 8 - AV_AAC_ADTS_HEADER_SIZE,
+                  AV_AAC_ADTS_HEADER_SIZE * 8);
 
-    if ((size = avpriv_aac_parse_header(&bits, &hdr)) < 0)
+    if ((size = ff_adts_header_parse(&bits, &hdr)) < 0)
         return 0;
     *need_next_header = 0;
     *new_frame_start  = 1;
@@ -54,7 +56,7 @@ static int aac_sync(uint64_t state, AACAC3ParseContext *hdr_info,
 static av_cold int aac_parse_init(AVCodecParserContext *s1)
 {
     AACAC3ParseContext *s = s1->priv_data;
-    s->header_size = AAC_ADTS_HEADER_SIZE;
+    s->header_size = AV_AAC_ADTS_HEADER_SIZE;
     s->sync = aac_sync;
     return 0;
 }