CD+G demuxer and decoder

[ffmpeg] / libavcodec / mpegaudiodata.h

diff --git a/libavcodec/mpegaudiodata.h b/libavcodec/mpegaudiodata.h
index 09254cb0a7dc3be2a349758391b5d4f23cac4a3a..e45a9d00ecb2ebc35583eb8e6eb1dd02aea73601 100644 (file)
--- a/libavcodec/mpegaudiodata.h
+++ b/libavcodec/mpegaudiodata.h
@@ -20,14 +20,17 @@
  */
 
 /**
- * @file mpegaudiodata.h
+ * @file libavcodec/mpegaudiodata.h
  * mpeg audio layer common tables.
  */
 
-#ifndef FFMPEG_MPEGAUDIODATA_H
-#define FFMPEG_MPEGAUDIODATA_H
+#ifndef AVCODEC_MPEGAUDIODATA_H
+#define AVCODEC_MPEGAUDIODATA_H
 
-#include "common.h"
+#include "libavutil/common.h"
+
+#define MODE_EXT_MS_STEREO 2
+#define MODE_EXT_I_STEREO  1
 
 extern const uint16_t ff_mpa_bitrate_tab[2][3][15];
 extern const uint16_t ff_mpa_freq_tab[3];
@@ -35,6 +38,6 @@ extern const int32_t ff_mpa_enwindow[257];
 extern const int ff_mpa_sblimit_table[5];
 extern const int ff_mpa_quant_steps[17];
 extern const int ff_mpa_quant_bits[17];
-extern const unsigned char *ff_mpa_alloc_tables[5];
+extern const unsigned char * const ff_mpa_alloc_tables[5];
 
-#endif /* FFMPEG_MPEGAUDIODATA_H */
+#endif /* AVCODEC_MPEGAUDIODATA_H */