aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/arm
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-10-04 03:21:14 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-10-04 03:24:59 +0200
commit2f9d6ffda78725e11b351a7a5d69414a32010810 (patch)
treeb9bf0e40ad2b85a35af8b5c0b9b6d50c19ad5303 /libavcodec/arm
parent98df93c9fe2dd4698cd7b4d699b248cbfd1427b4 (diff)
parent60df6b004858dcab96fc96c6dd32484780a8d7c3 (diff)
downloadffmpeg-2f9d6ffda78725e11b351a7a5d69414a32010810.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: id3v2: remove pointless casts id3v2: read TXXX frames with two calls to decode_str() instead of one. id3v2: don't discard the whole tag when encountering empty frames. libvpx: fix build with older libvpx versions. ARM: check for inline asm 'y' operand modifier support Conflicts: libavcodec/libvpxenc.c libavformat/id3v2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm')
-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 c4c024a36a..38c8d1f9cc 100644
--- a/libavcodec/arm/dca.h
+++ b/libavcodec/arm/dca.h
@@ -24,7 +24,7 @@
#include <stdint.h>
#include "config.h"
-#if HAVE_NEON && HAVE_INLINE_ASM
+#if HAVE_NEON && HAVE_INLINE_ASM && HAVE_ASM_MOD_Y
#define int8x8_fmul_int32 int8x8_fmul_int32
static inline void int8x8_fmul_int32(float *dst, const int8_t *src, int scale)