aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-09-16 19:05:23 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-09-16 19:06:11 +0200
commita593f5bd9db642801fad5ca535a1d843e8f27e86 (patch)
treebe704edc073f2d53c37c4e7bcf39e441dafd91c7
parent094991eb69011b647bd3ec0c50c4c7ed14b2a1bf (diff)
downloadffmpeg-a593f5bd9db642801fad5ca535a1d843e8f27e86.tar.gz
arm/dca: Fix compilation of decode_blockcodes() with --enable-thumb
Fix Suggested-by: Reimar Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/arm/dca.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/arm/dca.h b/libavcodec/arm/dca.h
index 9b0efc0e64..05be7892dc 100644
--- a/libavcodec/arm/dca.h
+++ b/libavcodec/arm/dca.h
@@ -25,7 +25,7 @@
#include "config.h"
#include "libavutil/intmath.h"
-#if HAVE_ARMV6 && HAVE_INLINE_ASM && AV_GCC_VERSION_AT_LEAST(4,4)
+#if HAVE_ARMV6 && HAVE_INLINE_ASM && AV_GCC_VERSION_AT_LEAST(4,4) && !CONFIG_THUMB
#define decode_blockcodes decode_blockcodes
static inline int decode_blockcodes(int code1, int code2, int levels,