diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2011-09-28 00:50:08 +0200 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2011-09-30 15:37:05 +0200 |
| commit | 9bb7a128a34fb5e4abcd265e5dfcb61787ad2f0f (patch) | |
| tree | 56faf8726afa5aed56a68c9d1b9ee77de1c83703 /tests | |
| parent | 783f45de4f3ee03a661c7d1479fe1b513bc0a863 (diff) | |
| download | ffmpeg-9bb7a128a34fb5e4abcd265e5dfcb61787ad2f0f.tar.gz | |
fate: allow testing with libavfilter disabled
This declares dependencies to skip tests using libavfilter
when it is disabled.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 908f12f342341785bf0458e88a06d97a1af90339)
Conflicts:
configure
tests/Makefile
tests/fate.mak
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate.mak | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/fate.mak b/tests/fate.mak index 0e3331178b..cf6c44e8e4 100644 --- a/tests/fate.mak +++ b/tests/fate.mak @@ -128,7 +128,7 @@ FATE_TESTS += fate-id-cin-video fate-id-cin-video: CMD = framecrc -i $(SAMPLES)/idcin/idlog-2MB.cin -pix_fmt rgb24 FATE_TESTS += fate-idroq-video-dpcm fate-idroq-video-dpcm: CMD = framecrc -i $(SAMPLES)/idroq/idlogo.roq -FATE_TESTS += fate-idroq-video-encode +FATE_TESTS-$(CONFIG_AVFILTER) += fate-idroq-video-encode fate-idroq-video-encode: CMD = md5 -t 0.2 -f image2 -vcodec pgmyuv -i $(SAMPLES)/ffmpeg-synthetic/vsynth1/%02d.pgm -sws_flags +bitexact -vf pad=512:512:80:112 -f RoQ FATE_TESTS += fate-iff-byterun1 fate-iff-byterun1: CMD = framecrc -i $(SAMPLES)/iff/ASH.LBM -pix_fmt rgb24 |