diff options
| author | Christophe Gisquet <christophe.gisquet@gmail.com> | 2015-03-14 07:57:42 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-14 13:23:06 +0100 |
| commit | 4eb4451be191a0144ee6af0650f3798b526b9b2c (patch) | |
| tree | 9fad248f057a384cc63d8e1a8a24466f223c527a | |
| parent | c3bf52713a8485f5bcba4c37ae7373c6b67cd1eb (diff) | |
| download | ffmpeg-4eb4451be191a0144ee6af0650f3798b526b9b2c.tar.gz | |
x86: dct-test: fix compilation for prores
When the decoder is deactivated, the x86-optimized versions are
not compiled, resulting in a link error.
The C version is unaffected, as it is part of the idctdsp
subsystem.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/x86/dct-test.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/x86/dct-test.c b/libavcodec/x86/dct-test.c index 3a4c0df77c..63a9aeb9fb 100644 --- a/libavcodec/x86/dct-test.c +++ b/libavcodec/x86/dct-test.c @@ -22,7 +22,7 @@ #include "xvididct.h" #include "simple_idct.h" -#if ARCH_X86_64 && HAVE_MMX && HAVE_YASM +#if (CONFIG_PRORES_DECODER || CONFIG_PRORES_LGPL_DECODER) && ARCH_X86_64 && HAVE_YASM void ff_prores_idct_put_10_sse2(uint16_t *dst, int linesize, int16_t *block, int16_t *qmat); @@ -67,11 +67,11 @@ static const struct algo idct_tab_arch[] = { #endif #if HAVE_SSE2_EXTERNAL { "XVID-SSE2", ff_xvid_idct_sse2, FF_IDCT_PERM_SSE2, AV_CPU_FLAG_SSE2, 1 }, -#if ARCH_X86_64 - { "PR-SSE2", ff_prores_idct_put_10_sse2_wrap, FF_IDCT_PERM_TRANSPOSE, AV_CPU_FLAG_SSE2, 1 }, -#endif #endif #endif /* CONFIG_MPEG4_DECODER && HAVE_YASM */ +#if (CONFIG_PRORES_DECODER || CONFIG_PRORES_LGPL_DECODER) && ARCH_X86_64 && HAVE_YASM + { "PR-SSE2", ff_prores_idct_put_10_sse2_wrap, FF_IDCT_PERM_TRANSPOSE, AV_CPU_FLAG_SSE2, 1 }, +#endif { 0 } }; |