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/lossless-audio.mak | |
| parent | a7eabbb20dc077d7380f874b9c35fffa478186a6 (diff) | |
| parent | 1f3f896564501c23b44fcf605567c78ce066b539 (diff) | |
| download | ffmpeg-streaming-7dc0ed80e877a16a11ba45d747723d88e8a92cd8.zip ffmpeg-streaming-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/lossless-audio.mak')
| -rw-r--r-- | tests/fate/lossless-audio.mak | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/tests/fate/lossless-audio.mak b/tests/fate/lossless-audio.mak index e052a98..09d2df9 100644 --- a/tests/fate/lossless-audio.mak +++ b/tests/fate/lossless-audio.mak @@ -1,24 +1,26 @@ -FATE_SAMPLES_LOSSLESS_AUDIO += fate-lossless-alac +FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, MOV, ALAC) += fate-lossless-alac fate-lossless-alac: CMD = md5 -i $(SAMPLES)/lossless-audio/inside.m4a -f s16le -FATE_SAMPLES_LOSSLESS_AUDIO += fate-lossless-meridianaudio +FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, MLP, MLP) += fate-lossless-meridianaudio fate-lossless-meridianaudio: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.mlp -f s16le -FATE_SAMPLES_LOSSLESS_AUDIO += fate-lossless-monkeysaudio +FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, APE, APE) += fate-lossless-monkeysaudio fate-lossless-monkeysaudio: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.ape -f s16le -FATE_SAMPLES_LOSSLESS_AUDIO += fate-lossless-shorten +FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, SHORTEN, SHORTEN) += fate-lossless-shorten fate-lossless-shorten: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.shn -f s16le FATE_SAMPLES_LOSSLESS_AUDIO += fate-lossless-tak fate-lossless-tak: CMD = crc -i $(SAMPLES)/lossless-audio/luckynight-partial.tak -FATE_SAMPLES_LOSSLESS_AUDIO += fate-lossless-tta +FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, TTA, TTA) += fate-lossless-tta fate-lossless-tta: CMD = crc -i $(SAMPLES)/lossless-audio/inside.tta -FATE_SAMPLES_LOSSLESS_AUDIO += fate-lossless-wma +FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, ASF, WMALOSSLESS) += fate-lossless-wma fate-lossless-wma: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.wma -f s16le +FATE_SAMPLES_LOSSLESS_AUDIO += $(FATE_SAMPLES_LOSSLESS_AUDIO-yes) + FATE_SAMPLES_FFMPEG += $(FATE_SAMPLES_LOSSLESS_AUDIO) fate-lossless-audio: $(FATE_SAMPLES_LOSSLESS_AUDIO) |
