mirror of https://github.com/FFmpeg/FFmpeg.git
* qatar/master: fate: adpcm: cosmetics: Sort test entries fate: adpcm: Add dependencies svq3: cosmetics: Drop useless parentheses Conflicts: libavcodec/svq3.c Merged-by: Michael Niedermayer <michaelni@gmx.at>pull/6/merge
commit
d7b8a9a589
2 changed files with 91 additions and 91 deletions
@ -1,74 +1,74 @@ |
||||
FATE_ADPCM += fate-adpcm-ea-r2
|
||||
fate-adpcm-ea-r2: CMD = crc -i $(SAMPLES)/ea-mpc/THX_logo.mpc -vn |
||||
|
||||
FATE_ADPCM += fate-adpcm-ea-r3
|
||||
fate-adpcm-ea-r3: CMD = crc -i $(SAMPLES)/ea-vp6/THX_logo.vp6 -vn |
||||
|
||||
FATE_ADPCM += fate-adpcm-creative
|
||||
FATE_ADPCM-$(call DEMDEC, WAV, ADPCM_CT) += fate-adpcm-creative |
||||
fate-adpcm-creative: CMD = md5 -i $(SAMPLES)/creative/intro-partial.wav -f s16le |
||||
|
||||
FATE_ADPCM += fate-adpcm-creative-8-2bit
|
||||
FATE_ADPCM-$(call DEMDEC, VOC, ADPCM_SBPRO_2) += fate-adpcm-creative-8-2bit |
||||
fate-adpcm-creative-8-2bit: CMD = md5 -i $(SAMPLES)/creative/BBC_2BIT.VOC -f s16le |
||||
|
||||
FATE_ADPCM += fate-adpcm-creative-8-2.6bit
|
||||
FATE_ADPCM-$(call DEMDEC, VOC, ADPCM_SBPRO_3) += fate-adpcm-creative-8-2.6bit |
||||
fate-adpcm-creative-8-2.6bit: CMD = md5 -i $(SAMPLES)/creative/BBC_3BIT.VOC -f s16le |
||||
|
||||
FATE_ADPCM += fate-adpcm-creative-8-4bit
|
||||
FATE_ADPCM-$(call DEMDEC, VOC, ADPCM_SBPRO_4) += fate-adpcm-creative-8-4bit |
||||
fate-adpcm-creative-8-4bit: CMD = md5 -i $(SAMPLES)/creative/BBC_4BIT.VOC -f s16le |
||||
|
||||
FATE_ADPCM += fate-adpcm-ea-1
|
||||
FATE_ADPCM-$(call DEMDEC, EA, ADPCM_EA) += fate-adpcm-ea-1 |
||||
fate-adpcm-ea-1: CMD = framecrc -i $(SAMPLES)/ea-wve/networkBackbone-partial.wve -frames:a 26 -vn |
||||
|
||||
FATE_ADPCM += fate-adpcm-ea-2
|
||||
FATE_ADPCM-$(call DEMDEC, EA, ADPCM_EA) += fate-adpcm-ea-2 |
||||
fate-adpcm-ea-2: CMD = framecrc -i $(SAMPLES)/ea-dct/NFS2Esprit-partial.dct -vn |
||||
|
||||
FATE_ADPCM += fate-adpcm-ea-maxis-xa
|
||||
FATE_ADPCM-$(call DEMDEC, XA, ADPCM_EA_MAXIS_XA) += fate-adpcm-ea-maxis-xa |
||||
fate-adpcm-ea-maxis-xa: CMD = framecrc -i $(SAMPLES)/maxis-xa/SC2KBUG.XA -frames:a 30 |
||||
|
||||
FATE_ADPCM += fate-adpcm-ea-r1
|
||||
FATE_ADPCM-$(call DEMDEC, EA, ADPCM_EA_R1) += fate-adpcm-ea-r1 |
||||
fate-adpcm-ea-r1: CMD = framecrc -i $(SAMPLES)/ea-mad/NFS6LogoE.mad -vn |
||||
|
||||
FATE_ADPCM += fate-adpcm-ima-amv
|
||||
FATE_ADPCM-$(call DEMDEC, EA, ADPCM_EA_R2) += fate-adpcm-ea-r2 |
||||
fate-adpcm-ea-r2: CMD = crc -i $(SAMPLES)/ea-mpc/THX_logo.mpc -vn |
||||
|
||||
FATE_ADPCM-$(call DEMDEC, EA, ADPCM_EA_R3) += fate-adpcm-ea-r3 |
||||
fate-adpcm-ea-r3: CMD = crc -i $(SAMPLES)/ea-vp6/THX_logo.vp6 -vn |
||||
|
||||
FATE_ADPCM-$(call DEMDEC, AVI, ADPCM_IMA_AMV) += fate-adpcm-ima-amv |
||||
fate-adpcm-ima-amv: CMD = framecrc -i $(SAMPLES)/amv/MTV_high_res_320x240_sample_Penguin_Joke_MTV_from_WMV.amv -t 10 -vn |
||||
|
||||
FATE_ADPCM += fate-adpcm-ima-apc
|
||||
FATE_ADPCM-$(call DEMDEC, APC, ADPCM_IMA_APC) += fate-adpcm-ima-apc |
||||
fate-adpcm-ima-apc: CMD = md5 -i $(SAMPLES)/cryo-apc/cine007.APC -f s16le |
||||
|
||||
FATE_ADPCM += fate-adpcm-ima-dk3
|
||||
FATE_ADPCM-$(call DEMDEC, AVI, ADPCM_IMA_DK3) += fate-adpcm-ima-dk3 |
||||
fate-adpcm-ima-dk3: CMD = md5 -i $(SAMPLES)/duck/sop-audio-only.avi -f s16le |
||||
|
||||
FATE_ADPCM += fate-adpcm-ima-dk4
|
||||
FATE_ADPCM-$(call DEMDEC, AVI, ADPCM_IMA_DK4) += fate-adpcm-ima-dk4 |
||||
fate-adpcm-ima-dk4: CMD = md5 -i $(SAMPLES)/duck/salsa-audio-only.avi -f s16le |
||||
|
||||
FATE_ADPCM += fate-adpcm-ima-ea-eacs
|
||||
FATE_ADPCM-$(call DEMDEC, EA, ADPCM_IMA_EA_EACS) += fate-adpcm-ima-ea-eacs |
||||
fate-adpcm-ima-ea-eacs: CMD = framecrc -i $(SAMPLES)/ea-tgv/INTRO8K-partial.TGV -vn |
||||
|
||||
FATE_ADPCM += fate-adpcm-ima-ea-sead
|
||||
FATE_ADPCM-$(call DEMDEC, EA, ADPCM_IMA_EA_SEAD) += fate-adpcm-ima-ea-sead |
||||
fate-adpcm-ima-ea-sead: CMD = framecrc -i $(SAMPLES)/ea-tgv/INTEL_S.TGV -vn |
||||
|
||||
FATE_ADPCM += fate-adpcm-ima-iss
|
||||
FATE_ADPCM-$(call DEMDEC, ISS, ADPCM_IMA_ISS) += fate-adpcm-ima-iss |
||||
fate-adpcm-ima-iss: CMD = md5 -i $(SAMPLES)/funcom-iss/0004010100.iss -f s16le |
||||
|
||||
FATE_ADPCM += fate-adpcm-ima-smjpeg
|
||||
FATE_ADPCM-$(call DEMDEC, SMJPEG, ADPCM_IMA_SMJPEG) += fate-adpcm-ima-smjpeg |
||||
fate-adpcm-ima-smjpeg: CMD = framecrc -i $(SAMPLES)/smjpeg/scenwin.mjpg -vn |
||||
|
||||
FATE_ADPCM += fate-adpcm-ima_wav-stereo
|
||||
FATE_ADPCM-$(call DEMDEC, MOV, ADPCM_IMA_WAV) += fate-adpcm-ima_wav-stereo |
||||
fate-adpcm-ima_wav-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-L-ms11.mov -f s16le |
||||
|
||||
FATE_ADPCM += fate-adpcm-ima-ws
|
||||
FATE_ADPCM-$(call DEMDEC, WSVQA, ADPCM_IMA_WS) += fate-adpcm-ima-ws |
||||
fate-adpcm-ima-ws: CMD = framecrc -i $(SAMPLES)/vqa/cc-demo1-partial.vqa -vn |
||||
|
||||
FATE_ADPCM += fate-adpcm-ms-mono
|
||||
FATE_ADPCM-$(call DEMDEC, DXA, ADPCM_MS) += fate-adpcm-ms-mono |
||||
fate-adpcm-ms-mono: CMD = framecrc -i $(SAMPLES)/dxa/meetsquid.dxa -t 2 -vn |
||||
|
||||
FATE_ADPCM += fate-adpcm-thp
|
||||
FATE_ADPCM-$(call DEMDEC, MOV, ADPCM_MS) += fate-adpcm_ms-stereo |
||||
fate-adpcm_ms-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-L-ms02.mov -f s16le |
||||
|
||||
FATE_ADPCM-$(call DEMDEC, THP, ADPCM_THP) += fate-adpcm-thp |
||||
fate-adpcm-thp: CMD = framecrc -i $(SAMPLES)/thp/pikmin2-opening1-partial.thp -vn |
||||
|
||||
FATE_ADPCM += fate-adpcm-xa
|
||||
FATE_ADPCM-$(call DEMDEC, STR, ADPCM_XA) += fate-adpcm-xa |
||||
fate-adpcm-xa: CMD = framecrc -i $(SAMPLES)/psx-str/abc000_cut.str -vn |
||||
|
||||
FATE_ADPCM += fate-adpcm_ms-stereo
|
||||
fate-adpcm_ms-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-L-ms02.mov -f s16le |
||||
|
||||
FATE_SAMPLES_AVCONV += $(FATE_ADPCM)
|
||||
fate-adpcm: $(FATE_ADPCM) |
||||
FATE_SAMPLES_AVCONV += $(FATE_ADPCM-yes)
|
||||
fate-adpcm: $(FATE_ADPCM-yes) |
||||
|
Loading…
Reference in new issue