diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 13:37:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 13:37:29 +0100 |
| commit | fa4f57399774b7c09c5978652b2eaea77f8851e1 (patch) | |
| tree | 2b3ed943f0f50750cb99e762ff86f53f9007b3cb /libavcodec/cabac_functions.h | |
| parent | cbee7ff0b7dfefab7f9a5d8639e493ab90c0a0cb (diff) | |
| parent | 634d9d8b398982647b3d7160641198744901d8d8 (diff) | |
| download | ffmpeg-fa4f57399774b7c09c5978652b2eaea77f8851e1.tar.gz | |
Merge commit '634d9d8b398982647b3d7160641198744901d8d8'
* commit '634d9d8b398982647b3d7160641198744901d8d8':
arm: 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 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/cabac_functions.h b/libavcodec/cabac_functions.h index 562fd3ab5c..d7d6d7dfdb 100644 --- a/libavcodec/cabac_functions.h +++ b/libavcodec/cabac_functions.h @@ -35,6 +35,9 @@ #if ARCH_AARCH64 # include "aarch64/cabac.h" #endif +#if ARCH_ARM +# include "arm/cabac.h" +#endif #if ARCH_X86 # include "x86/cabac.h" #endif |