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 /libavcodec/Makefile | |
| 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>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 2 |
1 files changed, 1 insertions, 1 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 |