aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2013-06-15 22:46:01 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2013-06-24 08:44:24 +0200
commit1065d4197e979f5b37d5232e90eeb1f35d994ccd (patch)
tree20fa2660f1a0952e631d2d1ce35b40390a36ac18 /libavcodec
parentfbb1af39e464f519fbc8b2dd964d80ac19eb76b6 (diff)
downloadffmpeg-1065d4197e979f5b37d5232e90eeb1f35d994ccd.tar.gz
mathops/x86: work around inline asm miscompilation with GCC 4.8.1
The volatile is not required here, and prevents a miscompilation with GCC 4.8.1 when building on x86 with --cpu=i686 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 659df32a9d8984081ccd54adc3aee7daeb33388d)
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/x86/mathops.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h
index 79e29e6232..76ea1315c2 100644
--- a/libavcodec/x86/mathops.h
+++ b/libavcodec/x86/mathops.h
@@ -74,7 +74,7 @@ static av_always_inline av_const int64_t MUL64(int a, int b)
static inline av_const int mid_pred(int a, int b, int c)
{
int i=b;
- __asm__ volatile(
+ __asm__ (
"cmp %2, %1 \n\t"
"cmovg %1, %0 \n\t"
"cmovg %2, %1 \n\t"