diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-26 22:24:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-26 22:24:58 +0200 |
| commit | e890b689628634d75e093b24ae257b008fc85443 (patch) | |
| tree | af2189297e3da55438dc0e968633a8a2806fb5fd /tests | |
| parent | f1f5b39866c4deb7800aa9288010cdbd386da477 (diff) | |
| parent | 0a07f2b346433a9a2677c69c6b29a1a827e39109 (diff) | |
| download | ffmpeg-e890b689628634d75e093b24ae257b008fc85443.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dsputil: fix invalid array indexing
configure: add libavresample to rpath
build: icc: silence some warnings
fft-test: add option to set cpuflag mask
cpu: recognise only cpu flag names pertinent to the architecture
avutil: add av_parse_cpu_flags() function
vp8: armv6: fix non-armv6t2 build
vp8: armv6 optimisations
vp8: arm: separate ARMv6 functions from NEON
ARM: add some compatibility macros
mov: support eac3 audio
avf: fix faulty check in has_duration
Conflicts:
configure
doc/APIchanges
ffmpeg.c
libavcodec/arm/Makefile
libavcodec/arm/asm.S
libavcodec/arm/vp8dsp_armv6.S
libavcodec/arm/vp8dsp_init_arm.c
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/fft.mak | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/tests/fate/fft.mak b/tests/fate/fft.mak index 3afbbe0116..d4199384a4 100644 --- a/tests/fate/fft.mak +++ b/tests/fate/fft.mak @@ -4,36 +4,38 @@ FATE_FFT += fate-fft-$(1) fate-ifft-$(1) \ fate-rdft-$(1) fate-irdft-$(1) \ fate-dct1d-$(1) fate-idct1d-$(1) -fate-fft-$(N): CMD = run libavcodec/fft-test -n$(1) -fate-ifft-$(N): CMD = run libavcodec/fft-test -n$(1) -i -fate-mdct-$(N): CMD = run libavcodec/fft-test -n$(1) -m -fate-imdct-$(N): CMD = run libavcodec/fft-test -n$(1) -m -i -fate-rdft-$(N): CMD = run libavcodec/fft-test -n$(1) -r -fate-irdft-$(N): CMD = run libavcodec/fft-test -n$(1) -r -i -fate-dct1d-$(N): CMD = run libavcodec/fft-test -n$(1) -d -fate-idct1d-$(N): CMD = run libavcodec/fft-test -n$(1) -d -i +fate-fft-$(N): ARGS = -n$(1) +fate-ifft-$(N): ARGS = -n$(1) -i +fate-mdct-$(N): ARGS = -n$(1) -m +fate-imdct-$(N): ARGS = -n$(1) -m -i +fate-rdft-$(N): ARGS = -n$(1) -r +fate-irdft-$(N): ARGS = -n$(1) -r -i +fate-dct1d-$(N): ARGS = -n$(1) -d +fate-idct1d-$(N): ARGS = -n$(1) -d -i endef $(foreach N, 4 5 6 7 8 9 10 11 12, $(eval $(call DEF_FFT,$(N)))) fate-fft-test: $(FATE_FFT) $(FATE_FFT): libavcodec/fft-test$(EXESUF) +$(FATE_FFT): CMD = run libavcodec/fft-test $(CPUFLAGS:%=-c%) $(ARGS) $(FATE_FFT): REF = /dev/null define DEF_FFT_FIXED FATE_FFT_FIXED += fate-fft-fixed-$(1) fate-ifft-fixed-$(1) \ fate-mdct-fixed-$(1) fate-imdct-fixed-$(1) -fate-fft-fixed-$(1): CMD = run libavcodec/fft-fixed-test -n$(1) -fate-ifft-fixed-$(1): CMD = run libavcodec/fft-fixed-test -n$(1) -i -fate-mdct-fixed-$(1): CMD = run libavcodec/fft-fixed-test -n$(1) -m -fate-imdct-fixed-$(1): CMD = run libavcodec/fft-fixed-test -n$(1) -m -i +fate-fft-fixed-$(1): ARGS = -n$(1) +fate-ifft-fixed-$(1): ARGS = -n$(1) -i +fate-mdct-fixed-$(1): ARGS = -n$(1) -m +fate-imdct-fixed-$(1): ARGS = -n$(1) -m -i endef $(foreach N, 4 5 6 7 8 9 10 11 12, $(eval $(call DEF_FFT_FIXED,$(N)))) fate-fft-fixed-test: $(FATE_FFT_FIXED) $(FATE_FFT_FIXED): libavcodec/fft-fixed-test$(EXESUF) +$(FATE_FFT_FIXED): CMD = run libavcodec/fft-fixed-test $(CPUFLAGS:%=-c%) $(ARGS) $(FATE_FFT_FIXED): REF = /dev/null FATE_TESTS += $(FATE_FFT) $(FATE_FFT_FIXED) |