diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 13:26:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 13:27:04 +0100 |
| commit | cbee7ff0b7dfefab7f9a5d8639e493ab90c0a0cb (patch) | |
| tree | f556a557a72b5c403ab13db74fa62092616bd4a4 /libavcodec/cabac_functions.h | |
| parent | fc1d7811ef4afa6387d1d0e30c06cc8c89517ca6 (diff) | |
| parent | dfe224f377be3e45758c69d881ca7874b82d647a (diff) | |
| download | ffmpeg-cbee7ff0b7dfefab7f9a5d8639e493ab90c0a0cb.tar.gz | |
Merge commit 'dfe224f377be3e45758c69d881ca7874b82d647a'
* commit 'dfe224f377be3e45758c69d881ca7874b82d647a':
aarch64: get_cabac inline asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cabac_functions.h')
| -rw-r--r-- | libavcodec/cabac_functions.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/cabac_functions.h b/libavcodec/cabac_functions.h index 7e22064d06..562fd3ab5c 100644 --- a/libavcodec/cabac_functions.h +++ b/libavcodec/cabac_functions.h @@ -32,11 +32,13 @@ #include "cabac.h" #include "config.h" +#if ARCH_AARCH64 +# include "aarch64/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; |