Skip to content

Commit

Permalink
x86: dct-test: fix compilation for prores
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
cgisquet authored and michaelni committed Mar 14, 2015
1 parent c3bf527 commit 4eb4451
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions libavcodec/x86/dct-test.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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 }
};

Expand Down

0 comments on commit 4eb4451

Please sign in to comment.