diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-21 21:35:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-21 21:35:02 +0200 |
| commit | 79df91bfc403e97e50f3ba0ed9acabeeb5590cd4 (patch) | |
| tree | 02970fac33073c2792133aabf09efcea797d3710 /tests/fate | |
| parent | 94c4ad27dc6305a7e1f218b86311db019e41f632 (diff) | |
| parent | bd499d9af668aef979ec9f3f3215b8dd508c7ec1 (diff) | |
| download | ffmpeg-79df91bfc403e97e50f3ba0ed9acabeeb5590cd4.tar.gz | |
Merge commit 'bd499d9af668aef979ec9f3f3215b8dd508c7ec1'
* commit 'bd499d9af668aef979ec9f3f3215b8dd508c7ec1':
build: Conditionally build and test iirfilter
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate')
| -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 b5fa4f06db..f22802d429 100644 --- a/tests/fate/libavcodec.mak +++ b/tests/fate/libavcodec.mak @@ -9,7 +9,7 @@ fate-idct8x8: CMD = run libavcodec/dct-test -i fate-idct8x8: CMP = null fate-idct8x8: REF = /dev/null -FATE_LIBAVCODEC-yes += fate-iirfilter +FATE_LIBAVCODEC-$(CONFIG_IIRFILTER) += fate-iirfilter fate-iirfilter: libavcodec/iirfilter-test$(EXESUF) fate-iirfilter: CMD = run libavcodec/iirfilter-test |