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/voice.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/voice.mak')
| -rw-r--r-- | tests/fate/voice.mak | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/tests/fate/voice.mak b/tests/fate/voice.mak index 3dd9697bcf..b9bf8e1e51 100644 --- a/tests/fate/voice.mak +++ b/tests/fate/voice.mak @@ -5,12 +5,15 @@ FATE_VOICE += fate-g722enc fate-g722enc: tests/data/asynth-16000-1.sw fate-g722enc: CMD = md5 -ar 16000 -ac 1 -f s16le -i $(TARGET_PATH)/tests/data/asynth-16000-1.sw -acodec g722 -ac 1 -f g722 -FATE_VOICE += fate-gsm -fate-gsm: CMD = framecrc -i $(SAMPLES)/gsm/sample-gsm-8000.mov -t 10 - -FATE_VOICE += fate-gsm-ms +FATE_GSM += fate-gsm-ms fate-gsm-ms: CMD = framecrc -i $(SAMPLES)/gsm/ciao.wav +FATE_GSM += fate-gsm-toast +fate-gsm-toast: CMD = framecrc -i $(SAMPLES)/gsm/sample-gsm-8000.mov -t 10 + +FATE_VOICE += $(FATE_GSM) +fate-gsm: $(FATE_GSM) + FATE_VOICE += fate-qcelp fate-qcelp: CMD = pcm -i $(SAMPLES)/qcp/0036580847.QCP fate-qcelp: CMP = oneoff |