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:51:25 +0200
commit5e6135f68d77b0560373a655789c04fdb3be6df1 (patch)
tree51d8c95fc15c49618ae1824d82438c9e61af104a /libavcodec
parent8ddc9790edc1793e8b731234e4c288b1d576612a (diff)
downloadffmpeg-5e6135f68d77b0560373a655789c04fdb3be6df1.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 33d9a6c8ff..6fb7c32020 100644
--- a/libavcodec/x86/mathops.h
+++ b/libavcodec/x86/mathops.h
@@ -72,7 +72,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"