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/lossless-audio.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/lossless-audio.mak')
| -rw-r--r-- | tests/fate/lossless-audio.mak | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/fate/lossless-audio.mak b/tests/fate/lossless-audio.mak index 12abcc3694..0fa5dc8857 100644 --- a/tests/fate/lossless-audio.mak +++ b/tests/fate/lossless-audio.mak @@ -1,5 +1,5 @@ -FATE_LOSSLESS_AUDIO += fate-lossless-appleaudio -fate-lossless-appleaudio: CMD = md5 -i $(SAMPLES)/lossless-audio/inside.m4a -f s16le +FATE_LOSSLESS_AUDIO += fate-lossless-alac +fate-lossless-alac: CMD = md5 -i $(SAMPLES)/lossless-audio/inside.m4a -f s16le FATE_LOSSLESS_AUDIO += fate-lossless-meridianaudio fate-lossless-meridianaudio: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.mlp -f s16le @@ -7,14 +7,14 @@ fate-lossless-meridianaudio: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-p FATE_LOSSLESS_AUDIO += fate-lossless-monkeysaudio fate-lossless-monkeysaudio: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.ape -f s16le -FATE_LOSSLESS_AUDIO += fate-lossless-shortenaudio -fate-lossless-shortenaudio: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.shn -f s16le +FATE_LOSSLESS_AUDIO += fate-lossless-shorten +fate-lossless-shorten: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.shn -f s16le FATE_LOSSLESS_AUDIO += fate-lossless-tta fate-lossless-tta: CMD = crc -i $(SAMPLES)/lossless-audio/inside.tta -FATE_LOSSLESS_AUDIO += fate-lossless-wavpackaudio -fate-lossless-wavpackaudio: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.wv -f s16le +FATE_LOSSLESS_AUDIO += fate-lossless-wavpack +fate-lossless-wavpack: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.wv -f s16le FATE_TESTS += $(FATE_LOSSLESS_AUDIO) fate-lossless-audio: $(FATE_LOSSLESS_AUDIO) |