diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-29 13:29:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-29 13:35:56 +0100 |
| commit | 7dc0ed80e877a16a11ba45d747723d88e8a92cd8 (patch) | |
| tree | b1842c70bb437b14e16ca833443615a2a267c2b8 /tests/fate/real.mak | |
| parent | a7eabbb20dc077d7380f874b9c35fffa478186a6 (diff) | |
| parent | 1f3f896564501c23b44fcf605567c78ce066b539 (diff) | |
| download | ffmpeg-7dc0ed80e877a16a11ba45d747723d88e8a92cd8.tar.gz | |
Merge commit '1f3f896564501c23b44fcf605567c78ce066b539'
* commit '1f3f896564501c23b44fcf605567c78ce066b539':
fate: Add dependencies for Vorbis, ProRes, QTRLE, utvideo tests
fate: real: Add dependencies
fate: lossless-audio: Add dependencies
x86: h264dsp: Fix linking with yasm and optimizations disabled
Conflicts:
libavcodec/x86/h264dsp_init.c
tests/fate/lossless-audio.mak
tests/fate/real.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/real.mak')
| -rw-r--r-- | tests/fate/real.mak | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/fate/real.mak b/tests/fate/real.mak index 3ebbd9e532..49b2eb48de 100644 --- a/tests/fate/real.mak +++ b/tests/fate/real.mak @@ -1,24 +1,24 @@ -FATE_REAL += fate-ra-144 +FATE_REAL-$(call DEMDEC, RM, RA_144) += fate-ra-144 fate-ra-144: CMD = md5 -i $(SAMPLES)/real/ra3_in_rm_file.rm -f s16le -FATE_REAL += fate-ra-288 +FATE_REAL-$(call DEMDEC, RM, RA_288) += fate-ra-288 fate-ra-288: CMD = pcm -i $(SAMPLES)/real/ra_288.rm fate-ra-288: CMP = oneoff fate-ra-288: REF = $(SAMPLES)/real/ra_288.pcm fate-ra-288: FUZZ = 2 -FATE_REAL += fate-ra-cook +FATE_REAL-$(call DEMDEC, RM, COOK) += fate-ra-cook fate-ra-cook: CMD = pcm -i $(SAMPLES)/real/ra_cook.rm fate-ra-cook: CMP = oneoff fate-ra-cook: REF = $(SAMPLES)/real/ra_cook.pcm -FATE_REAL += fate-ralf +FATE_REAL-$(call DEMDEC, RM, RALF) += fate-ralf fate-ralf: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.rmvb -vn -f s16le -FATE_REAL += fate-rv30 +FATE_REAL-$(call DEMDEC, RM, RV30) += fate-rv30 fate-rv30: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i $(SAMPLES)/real/rv30.rm -an -FATE_REAL += fate-rv40 +FATE_REAL-$(call DEMDEC, RM, RV40) += fate-rv40 fate-rv40: CMD = framecrc -i $(SAMPLES)/real/spygames-2MB.rmvb -t 10 -an FATE_SIPR += fate-sipr-5k0 @@ -39,8 +39,8 @@ fate-sipr-16k: REF = $(SAMPLES)/sipr/sipr_16k.pcm $(FATE_SIPR): CMP = oneoff -FATE_REAL += $(FATE_SIPR) +FATE_REAL-$(call DEMDEC, RM, SIPR) += $(FATE_SIPR) fate-sipr: $(FATE_SIPR) -FATE_SAMPLES_FFMPEG += $(FATE_REAL) -fate-real: $(FATE_REAL) +FATE_SAMPLES_FFMPEG += $(FATE_REAL-yes) +fate-real: $(FATE_REAL-yes) |