diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-20 02:14:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-20 02:14:54 +0100 |
| commit | 48706f41e1a17e04b0aa09852eff021833708233 (patch) | |
| tree | d33af96fedd771264c6717eacd2d54800bc05aff /tests/fate/real.mak | |
| parent | 9d35fa43eea1c0646a5f3e4ba537d58f574b9ca7 (diff) | |
| parent | a85ce653fb14ae968419453fabf1ffe10d1f15df (diff) | |
| download | ffmpeg-48706f41e1a17e04b0aa09852eff021833708233.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpeg12: check for available bits to avoid an infinite loop
fate: add some shorthands to run groups of tests
fate: Give some tests more sensible names.
cosmetics: Rename ffsink to avsink.
Conflicts:
avconv.c
cmdutils.c
cmdutils.h
ffmpeg.c
ffplay.c
tests/fate/audio.mak
tests/fate/demux.mak
tests/fate/dpcm.mak
tests/fate/image.mak
tests/fate/lossless-audio.mak
tests/fate/lossless-video.mak
tests/fate/microsoft.mak
tests/fate/pcm.mak
tests/fate/real.mak
tests/fate/screen.mak
tests/fate/video.mak
tests/fate/voice.mak
tests/fate/wma.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/real.mak')
| -rw-r--r-- | tests/fate/real.mak | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/tests/fate/real.mak b/tests/fate/real.mak index 0d1fa4d6b5..6566db668d 100644 --- a/tests/fate/real.mak +++ b/tests/fate/real.mak @@ -18,25 +18,28 @@ fate-rv30: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i $(SAMPLE FATE_REAL += fate-real-rv40 fate-real-rv40: CMD = framecrc -i $(SAMPLES)/real/spygames-2MB.rmvb -t 10 -an -vsync 0 -FATE_REAL += fate-sipr-5k0 +FATE_SIPR += fate-sipr-5k0 fate-sipr-5k0: CMD = pcm -i $(SAMPLES)/sipr/sipr_5k0.rm fate-sipr-5k0: CMP = oneoff fate-sipr-5k0: REF = $(SAMPLES)/sipr/sipr_5k0.pcm -FATE_REAL += fate-sipr-6k5 +FATE_SIPR += fate-sipr-6k5 fate-sipr-6k5: CMD = pcm -i $(SAMPLES)/sipr/sipr_6k5.rm fate-sipr-6k5: CMP = oneoff fate-sipr-6k5: REF = $(SAMPLES)/sipr/sipr_6k5.pcm -FATE_REAL += fate-sipr-8k5 +FATE_SIPR += fate-sipr-8k5 fate-sipr-8k5: CMD = pcm -i $(SAMPLES)/sipr/sipr_8k5.rm fate-sipr-8k5: CMP = oneoff fate-sipr-8k5: REF = $(SAMPLES)/sipr/sipr_8k5.pcm -FATE_REAL += fate-sipr-16k +FATE_SIPR += fate-sipr-16k fate-sipr-16k: CMD = pcm -i $(SAMPLES)/sipr/sipr_16k.rm fate-sipr-16k: CMP = oneoff fate-sipr-16k: REF = $(SAMPLES)/sipr/sipr_16k.pcm +FATE_REAL += $(FATE_SIPR) +fate-sipr: $(FATE_SIPR) + FATE_TESTS += $(FATE_REAL) fate-real: $(FATE_REAL) |