diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-21 22:29:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-21 22:29:15 +0200 |
| commit | 16c66f3151cfe54622492125b4c7654078582f96 (patch) | |
| tree | f748736d4383434853dec7d8906d767e06a96172 /libavcodec | |
| parent | 9a436ae30f10614e74fa4e1a561ce91cb0b2dd77 (diff) | |
| parent | 2ce53880bfeb431decdd2fc82298c0aff823ab47 (diff) | |
| download | ffmpeg-16c66f3151cfe54622492125b4c7654078582f96.tar.gz | |
Merge commit '2ce53880bfeb431decdd2fc82298c0aff823ab47'
* commit '2ce53880bfeb431decdd2fc82298c0aff823ab47':
build: Conditionally compile all avcodec test programs
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index a127e1d542..1225fcf77d 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -851,18 +851,16 @@ SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_internal.h SKIPHEADERS-$(CONFIG_VDA) += vda.h vda_internal.h SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h vdpau_internal.h -TESTPROGS = cabac \ - fft \ - fft-fixed \ - fft-fixed32 \ - golomb \ - imgconvert \ - rangecoder \ - snowenc \ +TESTPROGS = imgconvert \ +TESTPROGS-$(CONFIG_CABAC) += cabac +TESTPROGS-$(CONFIG_FFT) += fft fft-fixed fft-fixed32 TESTPROGS-$(CONFIG_IDCTDSP) += dct TESTPROGS-$(CONFIG_IIRFILTER) += iirfilter TESTPROGS-$(HAVE_MMX) += motion +TESTPROGS-$(CONFIG_GOLOMB) += golomb +TESTPROGS-$(CONFIG_RANGECODER) += rangecoder +TESTPROGS-$(CONFIG_SNOW_ENCODER) += snowenc TESTOBJS = dctref.o |