aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2014-07-21 05:27:45 -0700
committerDiego Biurrun <diego@biurrun.de>2014-07-21 05:32:35 -0700
commit16b7328058fa600d5158c84d9cc621a134eb88bc (patch)
tree11fbbf90a38a424088fb94e9947c4449e13fe413 /libavcodec
parentbd499d9af668aef979ec9f3f3215b8dd508c7ec1 (diff)
downloadffmpeg-16b7328058fa600d5158c84d9cc621a134eb88bc.tar.gz
build: Conditionally build and run DCT test program
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/Makefile4
-rw-r--r--libavcodec/dct-test.c5
2 files changed, 6 insertions, 3 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 684269c00d..7caddd602d 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -711,12 +711,12 @@ SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_internal.h
SKIPHEADERS-$(CONFIG_VDA) += vda.h vda_internal.h
SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h vdpau_internal.h
-TESTPROGS = dct \
- fft \
+TESTPROGS = fft \
fft-fixed \
golomb \
rangecoder \
+TESTPROGS-$(CONFIG_IDCTDSP) += dct
TESTPROGS-$(CONFIG_IIRFILTER) += iirfilter
TESTOBJS = dctref.o
diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c
index 979fc0b184..a531c88569 100644
--- a/libavcodec/dct-test.c
+++ b/libavcodec/dct-test.c
@@ -443,7 +443,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);
- } 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);
@@ -451,6 +453,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);
}
+#endif /* CONFIG_FDCTDSP */
}
if (err)