Merge commit '82bb3048013201c0095d2853d4623633d912252f'

[ffmpeg] / libavcodec / cabac_functions.h

diff --git a/libavcodec/cabac_functions.h b/libavcodec/cabac_functions.h
index 7e22064d0677581f0f9a4432dd1431e6e526c58b..d7d6d7dfdbbe4c2e491e810ad2e10beea9de9514 100644 (file)
--- a/libavcodec/cabac_functions.h
+++ b/libavcodec/cabac_functions.h
@@ -32,11 +32,16 @@
 #include "cabac.h"
 #include "config.h"
 
+#if ARCH_AARCH64
+#   include "aarch64/cabac.h"
+#endif
+#if ARCH_ARM
+#   include "arm/cabac.h"
+#endif
 #if ARCH_X86
 #   include "x86/cabac.h"
 #endif
 
-extern uint8_t ff_h264_cabac_tables[512 + 4*2*64 + 4*64 + 63];
 static uint8_t * const ff_h264_norm_shift = ff_h264_cabac_tables + H264_NORM_SHIFT_OFFSET;
 static uint8_t * const ff_h264_lps_range = ff_h264_cabac_tables + H264_LPS_RANGE_OFFSET;
 static uint8_t * const ff_h264_mlps_state = ff_h264_cabac_tables + H264_MLPS_STATE_OFFSET;