4 files changed, 11 insertions, 11 deletions
diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c
index 4dcf3974f1..b07f93acf0 100644
--- a/libavcodec/aac_ac3_parser.c
+++ b/libavcodec/aac_ac3_parser.c
@@ -23,12 +23,12 @@
 #include "parser.h"
 #include "aac_ac3_parser.h"
 
-int ac3_parse(AVCodecParserContext *s1,
+int ff_aac_ac3_parse(AVCodecParserContext *s1,
                      AVCodecContext *avctx,
                      const uint8_t **poutbuf, int *poutbuf_size,
                      const uint8_t *buf, int buf_size)
 {
-    AC3ParseContext *s = s1->priv_data;
+    AACAC3ParseContext *s = s1->priv_data;
     const uint8_t *buf_ptr;
     int len, sample_rate, bit_rate, channels, samples;
 
diff --git a/libavcodec/aac_ac3_parser.h b/libavcodec/aac_ac3_parser.h
index 03a6368ee7..a97ffd162c 100644
--- a/libavcodec/aac_ac3_parser.h
+++ b/libavcodec/aac_ac3_parser.h
@@ -23,16 +23,16 @@
 #ifndef AAC_AC3_PARSER_H
 #define AAC_AC3_PARSER_H
 
-typedef struct AC3ParseContext {
+typedef struct AACAC3ParseContext {
     uint8_t *inbuf_ptr;
     int frame_size;
     int header_size;
     int (*sync)(const uint8_t *buf, int *channels, int *sample_rate,
                 int *bit_rate, int *samples);
     uint8_t inbuf[8192]; /* input buffer */
-} AC3ParseContext;
+} AACAC3ParseContext;
 
-int ac3_parse(AVCodecParserContext *s1,
+int ff_aac_ac3_parse(AVCodecParserContext *s1,
                      AVCodecContext *avctx,
                      const uint8_t **poutbuf, int *poutbuf_size,
                      const uint8_t *buf, int buf_size);
diff --git a/libavcodec/aac_parser.c b/libavcodec/aac_parser.c
index 3962289917..d6cf2693fc 100644
--- a/libavcodec/aac_parser.c
+++ b/libavcodec/aac_parser.c
@@ -80,7 +80,7 @@ static int aac_sync(const uint8_t *buf, int *channels, int *sample_rate,
 
 static int aac_parse_init(AVCodecParserContext *s1)
 {
-    AC3ParseContext *s = s1->priv_data;
+    AACAC3ParseContext *s = s1->priv_data;
     s->inbuf_ptr = s->inbuf;
     s->header_size = AAC_HEADER_SIZE;
     s->sync = aac_sync;
@@ -90,8 +90,8 @@ static int aac_parse_init(AVCodecParserContext *s1)
 
 AVCodecParser aac_parser = {
     { CODEC_ID_AAC },
-    sizeof(AC3ParseContext),
+    sizeof(AACAC3ParseContext),
     aac_parse_init,
-    ac3_parse,
+    ff_aac_ac3_parse,
     NULL,
 };
diff --git a/libavcodec/ac3_parser.c b/libavcodec/ac3_parser.c
index 0563b8b2b1..4758ef2b51 100644
--- a/libavcodec/ac3_parser.c
+++ b/libavcodec/ac3_parser.c
@@ -145,7 +145,7 @@ static int ac3_sync(const uint8_t *buf, int *channels, int *sample_rate,
 
 static int ac3_parse_init(AVCodecParserContext *s1)
 {
-    AC3ParseContext *s = s1->priv_data;
+    AACAC3ParseContext *s = s1->priv_data;
     s->inbuf_ptr = s->inbuf;
     s->header_size = AC3_HEADER_SIZE;
     s->sync = ac3_sync;
@@ -155,8 +155,8 @@ static int ac3_parse_init(AVCodecParserContext *s1)
 
 AVCodecParser ac3_parser = {
     { CODEC_ID_AC3 },
-    sizeof(AC3ParseContext),
+    sizeof(AACAC3ParseContext),
     ac3_parse_init,
-    ac3_parse,
+    ff_aac_ac3_parse,
     NULL,
 };