diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-07 11:37:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-07 11:37:47 +0200 |
| commit | b67cb58520ff455f04687272f4c74c98ed390b1a (patch) | |
| tree | 9d01ade0ab60239f9a86fe2e4b65f338c66669f5 | |
| parent | 57f0f86f72a1a433880a73eb7fc401188b67fac8 (diff) | |
| parent | ce1e8045e04ed1a6e9c8c20e48ad3acf9cf664d2 (diff) | |
| download | ffmpeg-b67cb58520ff455f04687272f4c74c98ed390b1a.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: fdct: Employ more specific ifdefs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/x86/fdct.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/libavcodec/x86/fdct.c b/libavcodec/x86/fdct.c index d35245dbbe..11a13bb704 100644 --- a/libavcodec/x86/fdct.c +++ b/libavcodec/x86/fdct.c @@ -34,7 +34,7 @@ #include "libavutil/x86/asm.h" #include "libavcodec/dct.h" -#if HAVE_INLINE_ASM +#if HAVE_MMX_INLINE ////////////////////////////////////////////////////////////////////// // @@ -556,6 +556,10 @@ void ff_fdct_mmx(int16_t *block) } } +#endif /* HAVE_MMX_INLINE */ + +#if HAVE_MMXEXT_INLINE + void ff_fdct_mmxext(int16_t *block) { DECLARE_ALIGNED(8, int64_t, align_tmp)[16]; @@ -574,6 +578,10 @@ void ff_fdct_mmxext(int16_t *block) } } +#endif /* HAVE_MMXEXT_INLINE */ + +#if HAVE_SSE2_INLINE + void ff_fdct_sse2(int16_t *block) { DECLARE_ALIGNED(16, int64_t, align_tmp)[16]; @@ -583,4 +591,4 @@ void ff_fdct_sse2(int16_t *block) fdct_row_sse2(block1, block); } -#endif /* HAVE_INLINE_ASM */ +#endif /* HAVE_SSE2_INLINE */ |