diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-17 04:43:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-17 04:43:12 +0100 |
| commit | 8a91da9575dd54fca6f411f28b5f0847a39d0bff (patch) | |
| tree | 7e570ecd134fcb5dd4b49fb54f14c597e9ca0ee3 /tests/Makefile | |
| parent | 4c1da0d11e03ba0612a596cc62566321ad088319 (diff) | |
| parent | e5d403720ec4914169f55913a5a5555d908500b6 (diff) | |
| download | ffmpeg-8a91da9575dd54fca6f411f28b5f0847a39d0bff.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: K&R formatting cosmetics
s3tc.h: Add missing #include to fix standalone header compilation.
FATE: add capability for audio encode/decode tests with fuzzy psnr comparison
FATE: allow a tolerance in the size comparison in do_tiny_psnr()
FATE: use absolute difference from a target value in do_tiny_psnr()
FATE: allow tests to set CMP_SHIFT to pass to tiny_psnr
FATE: use $fuzz directly in do_tiny_psnr() instead of passing it around
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/Makefile')
| -rw-r--r-- | tests/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/Makefile b/tests/Makefile index d9856dcd65..b5e0568b10 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -142,7 +142,7 @@ fate:: $(FATE) $(FATE): $(TOOL)$(EXESUF) $(FATE_UTILS:%=tests/%$(HOSTEXESUF)) @echo "TEST $(@:fate-%=%)" - $(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' '$(THREADS)' '$(THREAD_TYPE)' '$(CPUFLAGS)' + $(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' '$(THREADS)' '$(THREAD_TYPE)' '$(CPUFLAGS)' '$(CMP_SHIFT)' '$(CMP_TARGET)' '$(SIZE_TOLERANCE)' fate-list: @printf '%s\n' $(sort $(FATE)) |