diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-19 18:45:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-19 18:46:04 +0200 |
| commit | d303e0affd9274381a098da55ef4eca954f23b74 (patch) | |
| tree | 00a54bf98aa0c13c3689ec694b07e50a21102951 /tests | |
| parent | 257f274dfa000ae0add4aef8bd11375c8d32add0 (diff) | |
| parent | 3e9409b1d0ca6ee7063fa04d940af36a20b46a8b (diff) | |
| download | ffmpeg-d303e0affd9274381a098da55ef4eca954f23b74.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
simple_idct: simplify some ifdeffery
simple_idct: remove code for DCTELEM != int16
Remove VLAs in ff_amrwb_lsp2lpc()
fate: make vsynth tests depend on only the relevant vref
rtsp: remove disabled code
dsputil: restore mistakenly removed hunk of disabled code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/Makefile b/tests/Makefile index 4739446674..0a9e402c66 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -58,7 +58,8 @@ FATE = $(FATE_ACODEC) \ $(FATE_SEEK) \ $(filter-out %-aref,$(FATE_ACODEC)): $(AREF) -$(filter-out %-vref,$(FATE_VCODEC)): $(VREF) +$(filter-out %-vref,$(FATE_VSYNTH1)): fate-vsynth1-vref +$(filter-out %-vref,$(FATE_VSYNTH2)): fate-vsynth2-vref $(FATE_LAVF): $(REFS) $(FATE_LAVFI): $(REFS) tools/lavfi-showfiltfmts$(EXESUF) $(FATE_SEEK): fate-codec fate-lavf libavformat/seek-test$(EXESUF) |