Merge commit '1e9265cd8f0821acbeca1db437be1361a3976b85'

* commit '1e9265cd8f0821acbeca1db437be1361a3976b85':
  dct-test: test ff_simple_idct_neon only on ARM for now

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-01-15 14:19:07 +01:00
commit d01f8790d9
1 changed files with 1 additions and 1 deletions

View File

@ -167,7 +167,7 @@ static const struct algo idct_tab[] = {
#if HAVE_ARMV6 #if HAVE_ARMV6
{ "SIMPLE-ARMV6", ff_simple_idct_armv6, MMX_PERM, AV_CPU_FLAG_ARMV6 }, { "SIMPLE-ARMV6", ff_simple_idct_armv6, MMX_PERM, AV_CPU_FLAG_ARMV6 },
#endif #endif
#if HAVE_NEON #if HAVE_NEON && ARCH_ARM
{ "SIMPLE-NEON", ff_simple_idct_neon, PARTTRANS_PERM, AV_CPU_FLAG_NEON }, { "SIMPLE-NEON", ff_simple_idct_neon, PARTTRANS_PERM, AV_CPU_FLAG_NEON },
#endif #endif