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 /tests | |
| 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 'tests')
| -rw-r--r-- | tests/fate/libavcodec.mak | 2 |
1 files changed, 1 insertions, 1 deletions
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 |