diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-06 13:24:54 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-06 13:25:22 +0400 |
commit | d0b27036763fca5d1bc0286dc52237fdab4050ee (patch) | |
tree | 60085bf3f2f74ce7974a92d151062633240bc86b /libavcodec/dct-test.c | |
parent | 90cecd3c9b6bf4a18f9b3f19fa5e3e2f7c1e24d9 (diff) | |
parent | 0b8b2ae5e93d616c2ece59f7175f483154cff918 (diff) |
Merge commit '0b8b2ae5e93d616c2ece59f7175f483154cff918'
* commit '0b8b2ae5e93d616c2ece59f7175f483154cff918':
x86: xviddct: Employ more specific ifdefs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dct-test.c')
-rw-r--r-- | libavcodec/dct-test.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c index 364733693b..4809124254 100644 --- a/libavcodec/dct-test.c +++ b/libavcodec/dct-test.c @@ -84,7 +84,11 @@ static const struct algo fdct_tab[] = { #if HAVE_MMX_INLINE { "MMX", ff_fdct_mmx, NO_PERM, AV_CPU_FLAG_MMX }, +#endif +#if HAVE_MMXEXT_INLINE { "MMXEXT", ff_fdct_mmxext, NO_PERM, AV_CPU_FLAG_MMXEXT }, +#endif +#if HAVE_SSE2_INLINE { "SSE2", ff_fdct_sse2, NO_PERM, AV_CPU_FLAG_SSE2 }, #endif @@ -125,7 +129,11 @@ static const struct algo idct_tab[] = { #if HAVE_MMX_INLINE { "SIMPLE-MMX", ff_simple_idct_mmx, MMX_SIMPLE_PERM, AV_CPU_FLAG_MMX }, { "XVID-MMX", ff_idct_xvid_mmx, NO_PERM, AV_CPU_FLAG_MMX, 1 }, +#endif +#if HAVE_MMXEXT_INLINE { "XVID-MMXEXT", ff_idct_xvid_mmxext, NO_PERM, AV_CPU_FLAG_MMXEXT, 1 }, +#endif +#if HAVE_SSE2_INLINE { "XVID-SSE2", ff_idct_xvid_sse2, SSE2_PERM, AV_CPU_FLAG_SSE2, 1 }, #if ARCH_X86_64 && HAVE_YASM { "PR-SSE2", ff_prores_idct_put_10_sse2_wrap, TRANSPOSE_PERM, AV_CPU_FLAG_SSE2, 1 }, |