diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2013-06-15 22:46:01 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-06-24 08:45:50 +0200 |
| commit | 24dc6b1a06d6dcfd02b34a07f452ea33cd07d9d2 (patch) | |
| tree | 82a08ab35a84a77f42d8fde48d8006435bc3a8d5 | |
| parent | d8e76a531cd7064725fbb8ff842c60d6d6fabd3d (diff) | |
| download | ffmpeg-24dc6b1a06d6dcfd02b34a07f452ea33cd07d9d2.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)
| -rw-r--r-- | libavcodec/x86/mathops.h | 2 |
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" |