diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-15 05:22:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-15 05:23:03 +0100 |
| commit | 53e6977c07a8720cf4f785ef23686bf34b5cec57 (patch) | |
| tree | 4c66c986729fbc08a5352bf545fd6e609f23b39c /libavutil/bswap.h | |
| parent | 9d228676132920992e46bfb57f036072ba3ce93b (diff) | |
| parent | d0cd2a8c461f975eeaeff2900e95fa8ec0931ef8 (diff) | |
| download | ffmpeg-53e6977c07a8720cf4f785ef23686bf34b5cec57.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
aarch64: bswap inline assembly
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/bswap.h')
| -rw-r--r-- | libavutil/bswap.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavutil/bswap.h b/libavutil/bswap.h index 06f654816d..f38e1dec83 100644 --- a/libavutil/bswap.h +++ b/libavutil/bswap.h @@ -34,7 +34,9 @@ #include "config.h" -#if ARCH_ARM +#if ARCH_AARCH64 +# include "aarch64/bswap.h" +#elif ARCH_ARM # include "arm/bswap.h" #elif ARCH_AVR32 # include "avr32/bswap.h" |