diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-14 23:58:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-14 23:58:10 +0100 |
| commit | e462257242fc037c99206457d1316e1ff9e5306f (patch) | |
| tree | 045910517a8b587f7a016b1c46403e1d1021f4f2 /tests/fate/wma.mak | |
| parent | a1be5bc79d7ac4c7c7ed79c4d72b4f1945ecb55c (diff) | |
| parent | 115a57302a7d6661426304bec3a5bc72d0edf4b0 (diff) | |
| download | ffmpeg-e462257242fc037c99206457d1316e1ff9e5306f.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (23 commits)
applehttp: Properly clean up if unable to probe a segment
applehttp: Avoid reading uninitialized memory
fate: Replace misleading "aac" in the name of an ADTS test with "adts".
fate: Drop pointless "-an" from pictor test command.
fate: split off image codec FATE tests into their own file
fate: split off WMA codec FATE tests into their own file
fate: split off lossless video and audio FATE tests into their own files
fate: split off qtrle codec FATE tests into their own file
fate: split off Ut Video codec FATE tests into their own file
fate: split off screen codec FATE tests into their own file
fate: split off Real Inc. codec FATE tests into their own file
fate: split off AC-3 codec FATE tests into their own file
mpegvideo: remove abort() in ff_find_unused_picture()
rv40: NEON optimised loop filter strength selection
rv40: rearrange loop filter functions
configure: cosmetics: sort some lists where appropriate
swscale_mmx: drop no longer required parameters from VSCALEX macros
swscale: Mark yuv2planeX_8_mmx as MMX2; it contains MMX2 instructions.
build: conditionally compile x86 H.264 chroma optimizations
v410 encoder and decoder
...
Conflicts:
Changelog
configure
doc/developer.texi
doc/general.texi
libavcodec/arm/asm.S
libavcodec/avcodec.h
libavcodec/v410dec.c
libavcodec/v410enc.c
libavcodec/version.h
libavcodec/x86/Makefile
libavcodec/x86/dsputil_mmx.c
libswscale/x86/swscale_mmx.c
tests/Makefile
tests/fate2.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/wma.mak')
| -rw-r--r-- | tests/fate/wma.mak | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/tests/fate/wma.mak b/tests/fate/wma.mak new file mode 100644 index 0000000000..25626f3db6 --- /dev/null +++ b/tests/fate/wma.mak @@ -0,0 +1,27 @@ +FATE_TESTS += fate-wmapro-2ch +fate-wmapro-2ch: CMD = pcm -i $(SAMPLES)/wmapro/Beethovens_9th-1_small.wma +fate-wmapro-2ch: CMP = oneoff +fate-wmapro-2ch: REF = $(SAMPLES)/wmapro/Beethovens_9th-1_small.pcm + +FATE_TESTS += fate-wmapro-5.1 +fate-wmapro-5.1: CMD = pcm -i $(SAMPLES)/wmapro/latin_192_mulitchannel_cut.wma +fate-wmapro-5.1: CMP = oneoff +fate-wmapro-5.1: REF = $(SAMPLES)/wmapro/latin_192_mulitchannel_cut.pcm + +FATE_TESTS += fate-wmavoice-7k +fate-wmavoice-7k: CMD = pcm -i $(SAMPLES)/wmavoice/streaming_CBR-7K.wma +fate-wmavoice-7k: CMP = stddev +fate-wmavoice-7k: REF = $(SAMPLES)/wmavoice/streaming_CBR-7K.pcm +fate-wmavoice-7k: FUZZ = 3 + +FATE_TESTS += fate-wmavoice-11k +fate-wmavoice-11k: CMD = pcm -i $(SAMPLES)/wmavoice/streaming_CBR-11K.wma +fate-wmavoice-11k: CMP = stddev +fate-wmavoice-11k: REF = $(SAMPLES)/wmavoice/streaming_CBR-11K.pcm +fate-wmavoice-11k: FUZZ = 3 + +FATE_TESTS += fate-wmavoice-19k +fate-wmavoice-19k: CMD = pcm -i $(SAMPLES)/wmavoice/streaming_CBR-19K.wma +fate-wmavoice-19k: CMP = stddev +fate-wmavoice-19k: REF = $(SAMPLES)/wmavoice/streaming_CBR-19K.pcm +fate-wmavoice-19k: FUZZ = 3 |