adx: Convert to the new bitstream reader

[ffmpeg] / libavcodec / ac3tab.c

diff --git a/libavcodec/ac3tab.c b/libavcodec/ac3tab.c
index 7df3d828fbf2f5a1a77aeb3cb50894911841adf3..3cd07f9e4b3e4f2bccbe46157766dd87b256cf5f 100644 (file)
--- a/libavcodec/ac3tab.c
+++ b/libavcodec/ac3tab.c
@@ -24,7 +24,9 @@
  * tables taken directly from the AC-3 spec.
  */
 
-#include "libavutil/audioconvert.h"
+#include "libavutil/channel_layout.h"
+#include "libavutil/mem.h"
+
 #include "avcodec.h"
 #include "ac3tab.h"
 
@@ -84,7 +86,7 @@ const uint8_t ff_ac3_channels_tab[8] = {
 /**
  * Map audio coding mode (acmod) to channel layout mask.
  */
-const uint16_t ff_ac3_channel_layout_tab[8] = {
+const uint16_t avpriv_ac3_channel_layout_tab[8] = {
     AV_CH_LAYOUT_STEREO,
     AV_CH_LAYOUT_MONO,
     AV_CH_LAYOUT_STEREO,