X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=libavcodec%2Fcabac_functions.h;h=484ba85db679b8fe99f5278fd99459a49bb3e297;hp=4c74cf7b2316c994f2d611b25d909bdd53fc9405;hb=14e9ffc1e41424a530c83310611979c0d246417b;hpb=444f47b55c17f8e1207caeb67f3c529a23e3ae61 diff --git a/libavcodec/cabac_functions.h b/libavcodec/cabac_functions.h index 4c74cf7b23..484ba85db6 100644 --- a/libavcodec/cabac_functions.h +++ b/libavcodec/cabac_functions.h @@ -36,9 +36,11 @@ # include "x86/cabac.h" #endif -extern const uint8_t ff_h264_norm_shift[512]; -extern uint8_t ff_h264_mlps_state[4*64]; -extern uint8_t ff_h264_lps_range[4*2*64]; ///< rangeTabLPS +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; +static uint8_t * const ff_h264_last_coeff_flag_offset_8x8 = ff_h264_cabac_tables + H264_LAST_COEFF_FLAG_OFFSET_8x8_OFFSET; static void refill(CABACContext *c){ #if CABAC_BITS == 16