diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-19 13:18:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-19 13:20:25 +0100 |
| commit | ed8ff70d9ee02b9940803aee69462da548df663b (patch) | |
| tree | 495891dd23a7f45f12682670719fe00a2c26fef0 /libavutil/internal.h | |
| parent | b45e0c2573fa5ce8c4821605f35ac4cad946e9d3 (diff) | |
| parent | 822b0728f0e3c3ba60b20bd4fd971d5c4a3fe3e9 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: dsputil: Drop some unused macro definitions
x86: Add a Yasm-based emms() replacement
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/internal.h')
| -rw-r--r-- | libavutil/internal.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavutil/internal.h b/libavutil/internal.h index 4400c5c439..487d0983b1 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -142,6 +142,9 @@ static av_always_inline void emms_c(void) #elif HAVE_MMX && HAVE_MM_EMPTY # include <mmintrin.h> # define emms_c _mm_empty +#elif HAVE_MMX && HAVE_YASM +# include "libavutil/x86/emms.h" +# define emms_c avpriv_emms_yasm #else # define emms_c() #endif /* HAVE_MMX_INLINE */ |