diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 9292c85b3f42ba09e5f93ab2bb16fd3d0ec33ad8..bebaf71466128c33d8efb212170913d3d6c9fe86 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -277,7 +277,7 @@ endif
OBJS-$(CONFIG_AAC_PARSER) += parser.o
-OBJS-$(CONFIG_AC3_PARSER) += parser.o ac3.o
+OBJS-$(CONFIG_AC3_PARSER) += parser.o
OBJS-$(CONFIG_CAVSVIDEO_PARSER) += cavs.o parser.o
OBJS-$(CONFIG_DVBSUB_PARSER) += dvbsubdec.o
OBJS-$(CONFIG_DVDSUB_PARSER) += dvdsubdec.o
diff --git a/libavcodec/ac3.c b/libavcodec/ac3.c
index 3749d02f0115c18742af33b30363337d9fccbdaf..eeb60d78f8cff2622fb49a9bc2770f1ea7bf385a 100644
--- a/libavcodec/ac3.c
+++ b/libavcodec/ac3.c
@@ -235,53 +235,3 @@ void ac3_common_init(void)
}
bndtab[50] = l;
}
-
-int ff_ac3_parse_header(const uint8_t buf[7], AC3HeaderInfo *hdr)
-{
- GetBitContext gbc;
-
- memset(hdr, 0, sizeof(*hdr));
-
- init_get_bits(&gbc, buf, 54);
-
- hdr->sync_word = get_bits(&gbc, 16);
- if(hdr->sync_word != 0x0B77)
- return -1;
-
- /* read ahead to bsid to make sure this is AC-3, not E-AC-3 */
- hdr->bsid = show_bits_long(&gbc, 29) & 0x1F;
- if(hdr->bsid > 10)
- return -2;
-
- hdr->crc1 = get_bits(&gbc, 16);
- hdr->fscod = get_bits(&gbc, 2);
- if(hdr->fscod == 3)
- return -3;
-
- hdr->frmsizecod = get_bits(&gbc, 6);
- if(hdr->frmsizecod > 37)
- return -4;
-
- skip_bits(&gbc, 5); // skip bsid, already got it
-
- hdr->bsmod = get_bits(&gbc, 3);
- hdr->acmod = get_bits(&gbc, 3);
- if((hdr->acmod & 1) && hdr->acmod != 1) {
- hdr->cmixlev = get_bits(&gbc, 2);
- }
- if(hdr->acmod & 4) {
- hdr->surmixlev = get_bits(&gbc, 2);
- }
- if(hdr->acmod == 2) {
- hdr->dsurmod = get_bits(&gbc, 2);
- }
- hdr->lfeon = get_bits1(&gbc);
-
- hdr->halfratecod = FFMAX(hdr->bsid, 8) - 8;
- hdr->sample_rate = ff_ac3_freqs[hdr->fscod] >> hdr->halfratecod;
- hdr->bit_rate = (ff_ac3_bitratetab[hdr->frmsizecod>>1] * 1000) >> hdr->halfratecod;
- hdr->channels = ff_ac3_channels[hdr->acmod] + hdr->lfeon;
- hdr->frame_size = ff_ac3_frame_sizes[hdr->frmsizecod][hdr->fscod] * 2;
-
- return 0;
-}
diff --git a/libavcodec/ac3.h b/libavcodec/ac3.h
index ae53a80c3d6bda7d1718e8708d9a7a1cff2a82d0..770103a45a3fc42d8cc56dd53ae3ececfaf9f863 100644
--- a/libavcodec/ac3.h
+++ b/libavcodec/ac3.h
@@ -77,18 +77,6 @@ typedef struct {
/** @} */
} AC3HeaderInfo;
-/**
- * Parses AC-3 frame header.
- * Parses the header up to the lfeon element, which is the first 52 or 54 bits
- * depending on the audio coding mode.
- * @param buf[in] Array containing the first 7 bytes of the frame.
- * @param hdr[out] Pointer to struct where header info is written.
- * @return Returns 0 on success, -1 if there is a sync word mismatch,
- * -2 if the bsid (version) element is invalid, -3 if the fscod (sample rate)
- * element is invalid, or -4 if the frmsizecod (bit rate) element is invalid.
- */
-int ff_ac3_parse_header(const uint8_t buf[7], AC3HeaderInfo *hdr);
-
extern const uint16_t ff_ac3_frame_sizes[38][3];
extern const uint8_t ff_ac3_channels[8];
extern const uint16_t ff_ac3_freqs[3];
diff --git a/libavcodec/parser.c b/libavcodec/parser.c
index 1c21d50fe57832e5da6e954f95b7bc3032b67cfc..6b0b98f9483be84d58a99d2f717b50d60c9f9b00 100644
--- a/libavcodec/parser.c
+++ b/libavcodec/parser.c
@@ -22,7 +22,6 @@
#include "avcodec.h"
#include "mpegvideo.h"
#include "mpegaudio.h"
-#include "ac3.h"
#include "parser.h"
AVCodecParser *av_first_parser = NULL;
@@ -605,6 +604,56 @@ static const int aac_channels[8] = {
#endif
#ifdef CONFIG_AC3_PARSER
+int ff_ac3_parse_header(const uint8_t buf[7], AC3HeaderInfo *hdr)
+{
+ GetBitContext gbc;
+
+ memset(hdr, 0, sizeof(*hdr));
+
+ init_get_bits(&gbc, buf, 54);
+
+ hdr->sync_word = get_bits(&gbc, 16);
+ if(hdr->sync_word != 0x0B77)
+ return -1;
+
+ /* read ahead to bsid to make sure this is AC-3, not E-AC-3 */
+ hdr->bsid = show_bits_long(&gbc, 29) & 0x1F;
+ if(hdr->bsid > 10)
+ return -2;
+
+ hdr->crc1 = get_bits(&gbc, 16);
+ hdr->fscod = get_bits(&gbc, 2);
+ if(hdr->fscod == 3)
+ return -3;
+
+ hdr->frmsizecod = get_bits(&gbc, 6);
+ if(hdr->frmsizecod > 37)
+ return -4;
+
+ skip_bits(&gbc, 5); // skip bsid, already got it
+
+ hdr->bsmod = get_bits(&gbc, 3);
+ hdr->acmod = get_bits(&gbc, 3);
+ if((hdr->acmod & 1) && hdr->acmod != 1) {
+ hdr->cmixlev = get_bits(&gbc, 2);
+ }
+ if(hdr->acmod & 4) {
+ hdr->surmixlev = get_bits(&gbc, 2);
+ }
+ if(hdr->acmod == 2) {
+ hdr->dsurmod = get_bits(&gbc, 2);
+ }
+ hdr->lfeon = get_bits1(&gbc);
+
+ hdr->halfratecod = FFMAX(hdr->bsid, 8) - 8;
+ hdr->sample_rate = ff_ac3_freqs[hdr->fscod] >> hdr->halfratecod;
+ hdr->bit_rate = (ff_ac3_bitratetab[hdr->frmsizecod>>1] * 1000) >> hdr->halfratecod;
+ hdr->channels = ff_ac3_channels[hdr->acmod] + hdr->lfeon;
+ hdr->frame_size = ff_ac3_frame_sizes[hdr->frmsizecod][hdr->fscod] * 2;
+
+ return 0;
+}
+
static int ac3_sync(const uint8_t *buf, int *channels, int *sample_rate,
int *bit_rate, int *samples)
{
diff --git a/libavcodec/parser.h b/libavcodec/parser.h
index 9452a096c097b14b1a0590d62d2fa7e00251f76c..80a6007e80ffd77dd0b1c6d22b29ff43b7a07051 100644
--- a/libavcodec/parser.h
+++ b/libavcodec/parser.h
@@ -23,6 +23,8 @@
#ifndef FFMPEG_PARSER_H
#define FFMPEG_PARSER_H
+#include "ac3.h"
+
typedef struct ParseContext{
uint8_t *buffer;
int index;
@@ -60,4 +62,16 @@ void ff_parse1_close(AVCodecParserContext *s);
/* h263dec.c */
int ff_mpeg4_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size);
+/**
+ * Parses AC-3 frame header.
+ * Parses the header up to the lfeon element, which is the first 52 or 54 bits
+ * depending on the audio coding mode.
+ * @param buf[in] Array containing the first 7 bytes of the frame.
+ * @param hdr[out] Pointer to struct where header info is written.
+ * @return Returns 0 on success, -1 if there is a sync word mismatch,
+ * -2 if the bsid (version) element is invalid, -3 if the fscod (sample rate)
+ * element is invalid, or -4 if the frmsizecod (bit rate) element is invalid.
+ */
+int ff_ac3_parse_header(const uint8_t buf[7], AC3HeaderInfo *hdr);
+
#endif /* !FFMPEG_PARSER_H */
diff --git a/libavformat/raw.c b/libavformat/raw.c
index 32b439b01695eb3f6b55290cb15148d12e9615b4..81531a60f678af90414c96f1d73abb810edb3bf3 100644
--- a/libavformat/raw.c
+++ b/libavformat/raw.c
@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "avformat.h"
-#include "ac3.h"
+#include "parser.h"
#ifdef CONFIG_MUXERS
/* simple formats */