diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-21 22:02:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-21 22:02:23 +0200 |
| commit | 9a436ae30f10614e74fa4e1a561ce91cb0b2dd77 (patch) | |
| tree | 7afb103030d86a2eb06baabadf86d66937c5ceb8 | |
| parent | 79df91bfc403e97e50f3ba0ed9acabeeb5590cd4 (diff) | |
| parent | 16b7328058fa600d5158c84d9cc621a134eb88bc (diff) | |
| download | ffmpeg-9a436ae30f10614e74fa4e1a561ce91cb0b2dd77.tar.gz | |
Merge commit '16b7328058fa600d5158c84d9cc621a134eb88bc'
* commit '16b7328058fa600d5158c84d9cc621a134eb88bc':
build: Conditionally build and run DCT test program
Conflicts:
libavcodec/Makefile
libavcodec/dct-test.c
tests/fate/libavcodec.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/Makefile | 2 | ||||
| -rw-r--r-- | libavcodec/dct-test.c | 5 | ||||
| -rw-r--r-- | tests/fate/libavcodec.mak | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 32e4411ff1..a127e1d542 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -860,7 +860,7 @@ TESTPROGS = cabac \ rangecoder \ snowenc \ -TESTPROGS-$(CONFIG_DCT) += dct +TESTPROGS-$(CONFIG_IDCTDSP) += dct TESTPROGS-$(CONFIG_IIRFILTER) += iirfilter TESTPROGS-$(HAVE_MMX) += motion diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c index a11c91ced8..bc6b07744a 100644 --- a/libavcodec/dct-test.c +++ b/libavcodec/dct-test.c @@ -490,7 +490,9 @@ int main(int argc, char **argv) for (i = 0; idct_tab_arch[i].name; i++) if (!(~cpu_flags & idct_tab_arch[i].cpu_flag)) err |= dct_error(&idct_tab_arch[i], test, test_idct, speed, bits); - } else { + } +#if CONFIG_FDCTDSP + else { for (i = 0; i < FF_ARRAY_ELEMS(fdct_tab); i++) err |= dct_error(&fdct_tab[i], test, test_idct, speed, bits); @@ -498,6 +500,7 @@ int main(int argc, char **argv) if (!(~cpu_flags & fdct_tab_arch[i].cpu_flag)) err |= dct_error(&fdct_tab_arch[i], test, test_idct, speed, bits); } +#endif /* CONFIG_FDCTDSP */ } if (err) diff --git a/tests/fate/libavcodec.mak b/tests/fate/libavcodec.mak index f22802d429..138a1b2dcf 100644 --- a/tests/fate/libavcodec.mak +++ b/tests/fate/libavcodec.mak @@ -3,7 +3,7 @@ fate-golomb: libavcodec/golomb-test$(EXESUF) fate-golomb: CMD = run libavcodec/golomb-test fate-golomb: REF = /dev/null -FATE_LIBAVCODEC-$(CONFIG_DCT) += fate-idct8x8 +FATE_LIBAVCODEC-$(CONFIG_IDCTDSP) += fate-idct8x8 fate-idct8x8: libavcodec/dct-test$(EXESUF) fate-idct8x8: CMD = run libavcodec/dct-test -i fate-idct8x8: CMP = null |