diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-15 14:19:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-15 14:19:29 +0100 |
| commit | d01f8790d93a5cdb1c943002d480983da0e448df (patch) | |
| tree | 50afd840e27d73df79457353e30915ba92600dd9 | |
| parent | fb37d03a870876b56ca1f2af26a5c423b0abcb6f (diff) | |
| parent | 1e9265cd8f0821acbeca1db437be1361a3976b85 (diff) | |
| download | ffmpeg-d01f8790d93a5cdb1c943002d480983da0e448df.tar.gz | |
Merge commit '1e9265cd8f0821acbeca1db437be1361a3976b85'
* commit '1e9265cd8f0821acbeca1db437be1361a3976b85':
dct-test: test ff_simple_idct_neon only on ARM for now
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/dct-test.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c index 35f63a161d..6308348361 100644 --- a/libavcodec/dct-test.c +++ b/libavcodec/dct-test.c @@ -167,7 +167,7 @@ static const struct algo idct_tab[] = { #if HAVE_ARMV6 { "SIMPLE-ARMV6", ff_simple_idct_armv6, MMX_PERM, AV_CPU_FLAG_ARMV6 }, #endif -#if HAVE_NEON +#if HAVE_NEON && ARCH_ARM { "SIMPLE-NEON", ff_simple_idct_neon, PARTTRANS_PERM, AV_CPU_FLAG_NEON }, #endif |