[FFmpeg-cvslog] arm/dca: Fix compilation of decode_blockcodes() with --enable-thumb

Michael Niedermayer git at videolan.org
Sun Sep 16 19:36:21 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Sep 16 19:05:23 2012 +0200| [a593f5bd9db642801fad5ca535a1d843e8f27e86] | committer: Michael Niedermayer

arm/dca: Fix compilation of decode_blockcodes() with --enable-thumb

Fix Suggested-by: Reimar
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a593f5bd9db642801fad5ca535a1d843e8f27e86
---

 libavcodec/arm/dca.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/arm/dca.h b/libavcodec/arm/dca.h
index 9b0efc0..05be789 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,



More information about the ffmpeg-cvslog mailing list