Merge remote-tracking branch 'qatar/master'

* qatar/master: (36 commits)
  ARM: allow unaligned buffer in fixed-point NEON FFT4
  fate: test more FFT etc sizes
  dca: set AVCodecContext frame_size for DTS audio
  YASM: Shut up unused variable compiler warning with --disable-yasm.
  x86_32: Fix build on x86_32 with --disable-yasm.
  iirfilter: add fate test
  doxygen: Add qmul docs.
  ogg: propagate return values and return more meaningful error values
  H.264: fix overreads of qscale_table
  Remove unused static tables and static inline functions.
  eval: clear Parser instances before using
  dct-test: remove 'ref' function pointer from tables
  build: Remove deleted 'check' target from .PHONY list.
  oggdec: Abort Ogg header parsing when encountering a data packet.
  Add LGPL license boilerplate to files lacking it.
  mxfenc: small typo fix
  doxygen: Fix documentation for some VP8 functions.
  sha: use AV_RB32() instead of assuming buffer can be cast to uint32_t*
  des: allow unaligned input and output buffers
  aes: allow unaligned input and output buffers
  ...

Conflicts:
	libavcodec/dct-test.c
	libavcodec/libvpxenc.c
	libavcodec/x86/dsputil_mmx.c
	libavcodec/x86/h264_qpel_mmx.c
	libavfilter/x86/gradfun.c
	libavformat/oggdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 27 insertions, 19 deletions

diff --git a/tests/fate/fft.mak b/tests/fate/fft.mak
index 042a7bf322..feb47afe00 100644
--- a/tests/fate/fft.mak
+++ b/tests/fate/fft.mak
@@ -1,28 +1,36 @@
-FATE_FFT = fate-fft   fate-ifft   \
-           fate-mdct  fate-imdct  \
-           fate-rdft  fate-irdft  \
-           fate-dct1d fate-idct1d
-
-fate-fft:    CMD = run libavcodec/fft-test
-fate-ifft:   CMD = run libavcodec/fft-test -i
-fate-mdct:   CMD = run libavcodec/fft-test -m
-fate-imdct:  CMD = run libavcodec/fft-test -m -i
-fate-rdft:   CMD = run libavcodec/fft-test -r
-fate-irdft:  CMD = run libavcodec/fft-test -r -i
-fate-dct1d:  CMD = run libavcodec/fft-test -d
-fate-idct1d: CMD = run libavcodec/fft-test -d -i
+define DEF_FFT
+FATE_FFT += fate-fft-$(1)   fate-ifft-$(1)   \
+            fate-mdct-$(1)  fate-imdct-$(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
+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): REF = /dev/null
 
-FATE_FFT_FIXED = fate-fft-fixed  fate-ifft-fixed  \
-                 fate-mdct-fixed fate-imdct-fixed
+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
+endef
 
-fate-fft-fixed:   CMD = run libavcodec/fft-fixed-test
-fate-ifft-fixed:  CMD = run libavcodec/fft-fixed-test -i
-fate-mdct-fixed:  CMD = run libavcodec/fft-fixed-test -m
-fate-imdct-fixed: CMD = run libavcodec/fft-fixed-test -m -i
+$(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)