---
 tests/fate/demux.mak                               |    6 --
 tests/fate/dpcm.mak                                |   52 +++++++++++--------
 tests/fate/lossless-audio.mak                      |   12 ++--
 tests/fate/microsoft.mak                           |    4 +-
 tests/fate/pcm.mak                                 |   42 +++++++---------
 tests/fate/video.mak                               |   33 +++++++------
 tests/fate/voice.mak                               |    6 +-
 tests/fate/vpx.mak                                 |    4 +-
 tests/ref/fate/{creative-adpcm => adpcm-creative}  |    0
 ...tive-adpcm-8-2.6bit => adpcm-creative-8-2.6bit} |    0
 ...creative-adpcm-8-2bit => adpcm-creative-8-2bit} |    0
 ...creative-adpcm-8-4bit => adpcm-creative-8-4bit} |    0
 .../{ea-mad-adpcm-ea-r1 => adpcm-ea-mad-ea-r1}     |    0
 tests/ref/fate/{ea-tqi-adpcm => adpcm-ea-tqi}      |    0
 tests/ref/fate/{duck-dk3 => adpcm-ima-dk3}         |    0
 tests/ref/fate/{duck-dk4 => adpcm-ima-dk4}         |    0
 .../fate/{psx-str-v3-adpcm_xa => adpcm-psx-str-v3} |    0
 tests/ref/fate/{thp-mjpeg-adpcm => adpcm-thp}      |    0
 tests/ref/fate/{auravision => auravision-v1}       |    0
 tests/ref/fate/{bink-demux-video => bink-video}    |    0
 tests/ref/fate/{cvid => cvid-partial}              |    0
 tests/ref/fate/{idroq-video-dpcm => dpcm-idroq}    |    0
 tests/ref/fate/{sierra-audio => dpcm-sierra}       |    0
 tests/ref/fate/{truemotion1-15 => duck-tm1-15}     |    0
 tests/ref/fate/{truemotion1-24 => duck-tm1-24}     |    0
 tests/ref/fate/{feeble-dxa => dxa-feeble}          |    0
 tests/ref/fate/{gsm => gsm-toast}                  |    0
 .../fate/{lossless-appleaudio => lossless-alac}    |    0
 .../{lossless-shortenaudio => lossless-shorten}    |    0
 .../{lossless-wavpackaudio => lossless-wavpack}    |    0
 .../ref/fate/{qt-msadpcm-stereo => msadpcm-stereo} |    0
 .../{qt-msimaadpcm-stereo => msimaadpcm-stereo}    |    0
 ...stereo-signed-be => pcm-16bit-stereo-signed-be} |    0
 ...stereo-signed-le => pcm-16bit-stereo-signed-le} |    0
 ...m-8bit-mono-unsigned => pcm-8bit-mono-unsigned} |    0
 ...it-stereo-unsigned => pcm-8bit-stereo-unsigned} |    0
 tests/ref/fate/{pcm_dvd => pcm-dvd}                |    0
 tests/ref/fate/{ea-mad-pcm-planar => pcm-ea-mad}   |    0
 ...m-cvid-pcm-stereo-8bit => pcm-film-stereo-8bit} |    0
 tests/ref/fate/{iff-pcm => pcm-iff}                |    0
 tests/ref/fate/{w64 => pcm-w64}                    |    0
 tests/ref/fate/{vc1 => vc1_sa00040}                |    0
 tests/ref/fate/{video-xl => videoxl}               |    0
 tests/ref/fate/{vp3 => vp31}                       |    0
 44 files changed, 79 insertions(+), 80 deletions(-)
 rename tests/ref/fate/{creative-adpcm => adpcm-creative} (100%)
 rename tests/ref/fate/{creative-adpcm-8-2.6bit => adpcm-creative-8-2.6bit} 
(100%)
 rename tests/ref/fate/{creative-adpcm-8-2bit => adpcm-creative-8-2bit} (100%)
 rename tests/ref/fate/{creative-adpcm-8-4bit => adpcm-creative-8-4bit} (100%)
 rename tests/ref/fate/{ea-mad-adpcm-ea-r1 => adpcm-ea-mad-ea-r1} (100%)
 rename tests/ref/fate/{ea-tqi-adpcm => adpcm-ea-tqi} (100%)
 rename tests/ref/fate/{duck-dk3 => adpcm-ima-dk3} (100%)
 rename tests/ref/fate/{duck-dk4 => adpcm-ima-dk4} (100%)
 rename tests/ref/fate/{psx-str-v3-adpcm_xa => adpcm-psx-str-v3} (100%)
 rename tests/ref/fate/{thp-mjpeg-adpcm => adpcm-thp} (100%)
 rename tests/ref/fate/{auravision => auravision-v1} (100%)
 rename tests/ref/fate/{bink-demux-video => bink-video} (100%)
 rename tests/ref/fate/{cvid => cvid-partial} (100%)
 rename tests/ref/fate/{idroq-video-dpcm => dpcm-idroq} (100%)
 rename tests/ref/fate/{sierra-audio => dpcm-sierra} (100%)
 rename tests/ref/fate/{truemotion1-15 => duck-tm1-15} (100%)
 rename tests/ref/fate/{truemotion1-24 => duck-tm1-24} (100%)
 rename tests/ref/fate/{feeble-dxa => dxa-feeble} (100%)
 rename tests/ref/fate/{gsm => gsm-toast} (100%)
 rename tests/ref/fate/{lossless-appleaudio => lossless-alac} (100%)
 rename tests/ref/fate/{lossless-shortenaudio => lossless-shorten} (100%)
 rename tests/ref/fate/{lossless-wavpackaudio => lossless-wavpack} (100%)
 rename tests/ref/fate/{qt-msadpcm-stereo => msadpcm-stereo} (100%)
 rename tests/ref/fate/{qt-msimaadpcm-stereo => msimaadpcm-stereo} (100%)
 rename tests/ref/fate/{qt-rawpcm-16bit-stereo-signed-be => 
pcm-16bit-stereo-signed-be} (100%)
 rename tests/ref/fate/{qt-rawpcm-16bit-stereo-signed-le => 
pcm-16bit-stereo-signed-le} (100%)
 rename tests/ref/fate/{qt-rawpcm-8bit-mono-unsigned => pcm-8bit-mono-unsigned} 
(100%)
 rename tests/ref/fate/{qt-rawpcm-8bit-stereo-unsigned => 
pcm-8bit-stereo-unsigned} (100%)
 rename tests/ref/fate/{pcm_dvd => pcm-dvd} (100%)
 rename tests/ref/fate/{ea-mad-pcm-planar => pcm-ea-mad} (100%)
 rename tests/ref/fate/{film-cvid-pcm-stereo-8bit => pcm-film-stereo-8bit} 
(100%)
 rename tests/ref/fate/{iff-pcm => pcm-iff} (100%)
 rename tests/ref/fate/{w64 => pcm-w64} (100%)
 rename tests/ref/fate/{vc1 => vc1_sa00040} (100%)
 rename tests/ref/fate/{video-xl => videoxl} (100%)
 rename tests/ref/fate/{vp3 => vp31} (100%)

diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak
index 4dd953e..1589986 100644
--- a/tests/fate/demux.mak
+++ b/tests/fate/demux.mak
@@ -7,9 +7,6 @@ fate-aea-demux: CMD = crc -i $(SAMPLES)/aea/chirp.aea -acodec 
copy
 FATE_TESTS += fate-bink-demux
 fate-bink-demux: CMD = crc -i $(SAMPLES)/bink/Snd0a7d9b58.dee -vn -acodec copy
 
-FATE_TESTS += fate-bink-demux-video
-fate-bink-demux-video: CMD = framecrc -i $(SAMPLES)/bink/hol2br.bik
-
 FATE_TESTS += fate-bmv
 fate-bmv: CMD = framecrc -i $(SAMPLES)/bmv/SURFING-partial.BMV -pix_fmt rgb24
 
@@ -70,9 +67,6 @@ fate-qcp-demux: CMD = crc -i $(SAMPLES)/qcp/0036580847.QCP 
-acodec copy
 FATE_TESTS += fate-redcode-demux
 fate-redcode-demux: CMD = framecrc -i $(SAMPLES)/r3d/4MB-sample.r3d -vcodec 
copy -acodec copy
 
-FATE_TESTS += fate-sierra-audio
-fate-sierra-audio: CMD = md5 -i $(SAMPLES)/sol/lsl7sample.sol -f s16le
-
 FATE_TESTS += fate-sierra-vmd
 fate-sierra-vmd: CMD = framecrc -i $(SAMPLES)/vmd/12.vmd -vsync 0 -pix_fmt 
rgb24
 
diff --git a/tests/fate/dpcm.mak b/tests/fate/dpcm.mak
index 606a524..3dd70fe 100644
--- a/tests/fate/dpcm.mak
+++ b/tests/fate/dpcm.mak
@@ -4,39 +4,47 @@ fate-adpcm-ea-r2: CMD = crc -i $(SAMPLES)/ea-mpc/THX_logo.mpc 
-vn
 FATE_TESTS += fate-adpcm-ea-r3
 fate-adpcm-ea-r3: CMD = crc -i $(SAMPLES)/ea-vp6/THX_logo.vp6 -vn
 
-FATE_TESTS += fate-creative-adpcm
-fate-creative-adpcm: CMD = md5 -i $(SAMPLES)/creative/intro-partial.wav -f 
s16le
+FATE_TESTS += fate-adpcm-creative
+fate-adpcm-creative: CMD = md5 -i $(SAMPLES)/creative/intro-partial.wav -f 
s16le
 
-FATE_TESTS += fate-creative-adpcm-8-2bit
-fate-creative-adpcm-8-2bit: CMD = md5 -i $(SAMPLES)/creative/BBC_2BIT.VOC -f 
s16le
+FATE_TESTS += fate-adpcm-creative-8-2bit
+fate-adpcm-creative-8-2bit: CMD = md5 -i $(SAMPLES)/creative/BBC_2BIT.VOC -f 
s16le
 
-FATE_TESTS += fate-creative-adpcm-8-2.6bit
-fate-creative-adpcm-8-2.6bit: CMD = md5 -i $(SAMPLES)/creative/BBC_3BIT.VOC -f 
s16le
+FATE_TESTS += fate-adpcm-creative-8-2.6bit
+fate-adpcm-creative-8-2.6bit: CMD = md5 -i $(SAMPLES)/creative/BBC_3BIT.VOC -f 
s16le
 
-FATE_TESTS += fate-creative-adpcm-8-4bit
-fate-creative-adpcm-8-4bit: CMD = md5 -i $(SAMPLES)/creative/BBC_4BIT.VOC -f 
s16le
+FATE_TESTS += fate-adpcm-creative-8-4bit
+fate-adpcm-creative-8-4bit: CMD = md5 -i $(SAMPLES)/creative/BBC_4BIT.VOC -f 
s16le
 
-FATE_TESTS += fate-ea-mad-adpcm-ea-r1
-fate-ea-mad-adpcm-ea-r1: CMD = framecrc -i $(SAMPLES)/ea-mad/NFS6LogoE.mad
+FATE_TESTS += fate-adpcm-ea-mad-ea-r1
+fate-adpcm-ea-mad-ea-r1: CMD = framecrc -i $(SAMPLES)/ea-mad/NFS6LogoE.mad
 
-FATE_TESTS += fate-ea-tqi-adpcm
-fate-ea-tqi-adpcm: CMD = framecrc -i 
$(SAMPLES)/ea-wve/networkBackbone-partial.wve -frames:v 26
+FATE_TESTS += fate-adpcm-ea-tqi
+fate-adpcm-ea-tqi: CMD = framecrc -i 
$(SAMPLES)/ea-wve/networkBackbone-partial.wve -frames:v 26
 
-FATE_TESTS += fate-idroq-video-dpcm
-fate-idroq-video-dpcm: CMD = framecrc -i $(SAMPLES)/idroq/idlogo.roq
+FATE_TESTS += fate-adpcm-ima-dk3
+fate-adpcm-ima-dk3: CMD = md5 -i $(SAMPLES)/duck/sop-audio-only.avi -f s16le
 
-FATE_TESTS += fate-psx-str-v3-adpcm_xa
-fate-psx-str-v3-adpcm_xa: CMD = framecrc -i $(SAMPLES)/psx-str/abc000_cut.str 
-vn
+FATE_TESTS += fate-adpcm-ima-dk4
+fate-adpcm-ima-dk4: CMD = md5 -i $(SAMPLES)/duck/salsa-audio-only.avi -f s16le
 
-FATE_TESTS += fate-qt-msadpcm-stereo
-fate-qt-msadpcm-stereo: CMD = md5 -i 
$(SAMPLES)/qt-surge-suite/surge-2-16-L-ms02.mov -f s16le
+FATE_TESTS += fate-adpcm-psx-str-v3
+fate-adpcm-psx-str-v3: CMD = framecrc -i $(SAMPLES)/psx-str/abc000_cut.str -vn
 
-FATE_TESTS += fate-qt-msimaadpcm-stereo
-fate-qt-msimaadpcm-stereo: CMD = md5 -i 
$(SAMPLES)/qt-surge-suite/surge-2-16-L-ms11.mov -f s16le
+FATE_TESTS += fate-adpcm-thp
+fate-adpcm-thp: CMD = framecrc -idct simple -i 
$(SAMPLES)/thp/pikmin2-opening1-partial.thp
 
-FATE_TESTS += fate-thp-mjpeg-adpcm
-fate-thp-mjpeg-adpcm: CMD = framecrc -idct simple -i 
$(SAMPLES)/thp/pikmin2-opening1-partial.thp
+FATE_TESTS += fate-dpcm-idroq
+fate-dpcm-idroq: CMD = framecrc -i $(SAMPLES)/idroq/idlogo.roq
+
+FATE_TESTS += fate-dpcm-sierra
+fate-dpcm-sierra: CMD = md5 -i $(SAMPLES)/sol/lsl7sample.sol -f s16le
 
 FATE_TESTS += fate-dpcm-xan
 fate-dpcm-xan: CMD = md5 -i $(SAMPLES)/wc4-xan/wc4_2.avi -vn -f s16le
 
+FATE_TESTS += fate-msadpcm-stereo
+fate-msadpcm-stereo: CMD = md5 -i 
$(SAMPLES)/qt-surge-suite/surge-2-16-L-ms02.mov -f s16le
+
+FATE_TESTS += fate-msimaadpcm-stereo
+fate-msimaadpcm-stereo: CMD = md5 -i 
$(SAMPLES)/qt-surge-suite/surge-2-16-L-ms11.mov -f s16le
diff --git a/tests/fate/lossless-audio.mak b/tests/fate/lossless-audio.mak
index 93e4678..0a81b78 100644
--- a/tests/fate/lossless-audio.mak
+++ b/tests/fate/lossless-audio.mak
@@ -1,5 +1,5 @@
-FATE_TESTS += fate-lossless-appleaudio
-fate-lossless-appleaudio: CMD = md5 -i $(SAMPLES)/lossless-audio/inside.m4a -f 
s16le
+FATE_TESTS += fate-lossless-alac
+fate-lossless-alac: CMD = md5 -i $(SAMPLES)/lossless-audio/inside.m4a -f s16le
 
 FATE_TESTS += fate-lossless-meridianaudio
 fate-lossless-meridianaudio: CMD = md5 -i 
$(SAMPLES)/lossless-audio/luckynight-partial.mlp -f s16le
@@ -7,11 +7,11 @@ fate-lossless-meridianaudio: CMD = md5 -i 
$(SAMPLES)/lossless-audio/luckynight-p
 FATE_TESTS += fate-lossless-monkeysaudio
 fate-lossless-monkeysaudio: CMD = md5 -i 
$(SAMPLES)/lossless-audio/luckynight-partial.ape -f s16le
 
-FATE_TESTS += fate-lossless-shortenaudio
-fate-lossless-shortenaudio: CMD = md5 -i 
$(SAMPLES)/lossless-audio/luckynight-partial.shn -f s16le
+FATE_TESTS += fate-lossless-shorten
+fate-lossless-shorten: CMD = md5 -i 
$(SAMPLES)/lossless-audio/luckynight-partial.shn -f s16le
 
 FATE_TESTS += fate-lossless-tta
 fate-lossless-tta: CMD = crc -i $(SAMPLES)/lossless-audio/inside.tta
 
-FATE_TESTS += fate-lossless-wavpackaudio
-fate-lossless-wavpackaudio: CMD = md5 -i 
$(SAMPLES)/lossless-audio/luckynight-partial.wv -f s16le
+FATE_TESTS += fate-lossless-wavpack
+fate-lossless-wavpack: CMD = md5 -i 
$(SAMPLES)/lossless-audio/luckynight-partial.wv -f s16le
diff --git a/tests/fate/microsoft.mak b/tests/fate/microsoft.mak
index b36f854..7fd784d 100644
--- a/tests/fate/microsoft.mak
+++ b/tests/fate/microsoft.mak
@@ -14,8 +14,8 @@ fate-wmv8-drm: CMD = framecrc -cryptokey 
137381538c84c068111902a59c5cf6c340247c3
 FATE_TESTS += fate-wmv8-drm-nodec
 fate-wmv8-drm-nodec: CMD = framecrc -cryptokey 
137381538c84c068111902a59c5cf6c340247c39 -i $(SAMPLES)/wmv8/wmv_drm.wmv -acodec 
copy -vcodec copy
 
-FATE_TESTS += fate-vc1
-fate-vc1: CMD = framecrc -i $(SAMPLES)/vc1/SA00040.vc1
+FATE_TESTS += fate-vc1_sa00040
+fate-vc1_sa00040: CMD = framecrc -i $(SAMPLES)/vc1/SA00040.vc1
 
 FATE_TESTS += fate-vc1_sa00050
 fate-vc1_sa00050: CMD = framecrc -i $(SAMPLES)/vc1/SA00050.vc1
diff --git a/tests/fate/pcm.mak b/tests/fate/pcm.mak
index 2c4b8e4..c175441 100644
--- a/tests/fate/pcm.mak
+++ b/tests/fate/pcm.mak
@@ -1,32 +1,26 @@
-FATE_TESTS += fate-duck-dk3
-fate-duck-dk3: CMD = md5 -i $(SAMPLES)/duck/sop-audio-only.avi -f s16le
+FATE_TESTS += fate-pcm-8bit-mono-unsigned
+fate-pcm-8bit-mono-unsigned: CMD = md5 -i 
$(SAMPLES)/qt-surge-suite/surge-1-8-raw.mov -f s16le
 
-FATE_TESTS += fate-duck-dk4
-fate-duck-dk4: CMD = md5 -i $(SAMPLES)/duck/salsa-audio-only.avi -f s16le
+FATE_TESTS += fate-pcm-8bit-stereo-unsigned
+fate-pcm-8bit-stereo-unsigned: CMD = md5 -i 
$(SAMPLES)/qt-surge-suite/surge-2-8-raw.mov -f s16le
 
-FATE_TESTS += fate-ea-mad-pcm-planar
-fate-ea-mad-pcm-planar: CMD = framecrc -i $(SAMPLES)/ea-mad/xeasport.mad
+FATE_TESTS += fate-pcm-16bit-stereo-signed-be
+fate-pcm-16bit-stereo-signed-be: CMD = md5 -i 
$(SAMPLES)/qt-surge-suite/surge-2-16-B-twos.mov -f s16le
 
-FATE_TESTS += fate-film-cvid-pcm-stereo-8bit
-fate-film-cvid-pcm-stereo-8bit: CMD = framecrc -i 
$(SAMPLES)/film/logo-capcom.cpk
+FATE_TESTS += fate-pcm-16bit-stereo-signed-le
+fate-pcm-16bit-stereo-signed-le: CMD = md5 -i 
$(SAMPLES)/qt-surge-suite/surge-2-16-L-sowt.mov -f s16le
 
-FATE_TESTS += fate-iff-pcm
-fate-iff-pcm: CMD = md5 -i $(SAMPLES)/iff/Bells -f s16le
+FATE_TESTS += fate-pcm-dvd
+fate-pcm-dvd: CMD = framecrc -i $(SAMPLES)/pcm-dvd/coolitnow-partial.vob -vn
 
-FATE_TESTS += fate-pcm_dvd
-fate-pcm_dvd: CMD = framecrc -i $(SAMPLES)/pcm-dvd/coolitnow-partial.vob -vn
+FATE_TESTS += fate-pcm-ea-mad
+fate-pcm-ea-mad: CMD = framecrc -i $(SAMPLES)/ea-mad/xeasport.mad
 
-FATE_TESTS += fate-qt-rawpcm-8bit-mono-unsigned
-fate-qt-rawpcm-8bit-mono-unsigned: CMD = md5 -i 
$(SAMPLES)/qt-surge-suite/surge-1-8-raw.mov -f s16le
+FATE_TESTS += fate-pcm-film-stereo-8bit
+fate-pcm-film-stereo-8bit: CMD = framecrc -i $(SAMPLES)/film/logo-capcom.cpk
 
-FATE_TESTS += fate-qt-rawpcm-8bit-stereo-unsigned
-fate-qt-rawpcm-8bit-stereo-unsigned: CMD = md5 -i 
$(SAMPLES)/qt-surge-suite/surge-2-8-raw.mov -f s16le
+FATE_TESTS += fate-pcm-iff
+fate-pcm-iff: CMD = md5 -i $(SAMPLES)/iff/Bells -f s16le
 
-FATE_TESTS += fate-qt-rawpcm-16bit-stereo-signed-be
-fate-qt-rawpcm-16bit-stereo-signed-be: CMD = md5 -i 
$(SAMPLES)/qt-surge-suite/surge-2-16-B-twos.mov -f s16le
-
-FATE_TESTS += fate-qt-rawpcm-16bit-stereo-signed-le
-fate-qt-rawpcm-16bit-stereo-signed-le: CMD = md5 -i 
$(SAMPLES)/qt-surge-suite/surge-2-16-L-sowt.mov -f s16le
-
-FATE_TESTS += fate-w64
-fate-w64: CMD = crc -i $(SAMPLES)/w64/w64-pcm16.w64
+FATE_TESTS += fate-pcm-w64
+fate-pcm-w64: CMD = crc -i $(SAMPLES)/w64/w64-pcm16.w64
diff --git a/tests/fate/video.mak b/tests/fate/video.mak
index 6d23134..f2810db 100644
--- a/tests/fate/video.mak
+++ b/tests/fate/video.mak
@@ -19,8 +19,8 @@ fate-ansi: CMD = framecrc -chars_per_frame 44100 -i 
$(SAMPLES)/ansi/TRE-IOM5.ANS
 FATE_TESTS += fate-armovie-escape124
 fate-armovie-escape124: CMD = framecrc -i $(SAMPLES)/rpl/ESCAPE.RPL -pix_fmt 
rgb24
 
-FATE_TESTS += fate-auravision
-fate-auravision: CMD = framecrc -i $(SAMPLES)/auravision/SOUVIDEO.AVI -an
+FATE_TESTS += fate-auravision-v1
+fate-auravision-v1: CMD = framecrc -i $(SAMPLES)/auravision/SOUVIDEO.AVI -an
 
 FATE_TESTS += fate-auravision-v2
 fate-auravision-v2: CMD = framecrc -i 
$(SAMPLES)/auravision/salma-hayek-in-ugly-betty-partial-avi -an
@@ -31,6 +31,9 @@ fate-bethsoft-vid: CMD = framecrc -i 
$(SAMPLES)/bethsoft-vid/ANIM0001.VID -vsync
 FATE_TESTS += fate-bfi
 fate-bfi: CMD = framecrc -i $(SAMPLES)/bfi/2287.bfi -pix_fmt rgb24
 
+FATE_TESTS += fate-bink-video
+fate-bink-video: CMD = framecrc -i $(SAMPLES)/bink/hol2br.bik
+
 FATE_TESTS += fate-cdgraphics
 fate-cdgraphics: CMD = framecrc -i $(SAMPLES)/cdgraphics/BrotherJohn.cdg 
-pix_fmt rgb24 -t 1
 
@@ -43,8 +46,8 @@ fate-corepng: CMD = framecrc -i 
$(SAMPLES)/png1/corepng-partial.avi
 FATE_TESTS += fate-creatureshock-avs
 fate-creatureshock-avs: CMD = framecrc -i 
$(SAMPLES)/creatureshock-avs/OUTATIME.AVS -pix_fmt rgb24
 
-FATE_TESTS += fate-cvid
-fate-cvid: CMD = framecrc -i $(SAMPLES)/cvid/laracroft-cinepak-partial.avi -an
+FATE_TESTS += fate-cvid-partial
+fate-cvid-partial: CMD = framecrc -i 
$(SAMPLES)/cvid/laracroft-cinepak-partial.avi -an
 
 FATE_TESTS += fate-cvid-palette
 fate-cvid-palette: CMD = framecrc -i 
$(SAMPLES)/cvid/catfight-cvid-pal8-partial.mov -pix_fmt rgb24 -an
@@ -64,15 +67,21 @@ fate-delphine-cin: CMD = framecrc -i 
$(SAMPLES)/delphine-cin/LOGO-partial.CIN -p
 FATE_TESTS += fate-deluxepaint-anm
 fate-deluxepaint-anm: CMD = framecrc -i $(SAMPLES)/deluxepaint-anm/INTRO1.ANM 
-pix_fmt rgb24
 
+FATE_TESTS += fate-duck-tm1-15
+fate-duck-tm1-15: CMD = framecrc -i $(SAMPLES)/duck/phant2-940.duk -pix_fmt 
rgb24
+
+FATE_TESTS += fate-duck-tm1-24
+fate-duck-tm1-24: CMD = framecrc -i 
$(SAMPLES)/duck/sonic3dblast_intro-partial.avi -pix_fmt rgb24
+
 FATE_TESTS += fate-duck-tm2
 fate-duck-tm2: CMD = framecrc -i $(SAMPLES)/duck/tm20.avi
 
+FATE_TESTS += fate-dxa-feeble
+fate-dxa-feeble: CMD = framecrc -i $(SAMPLES)/dxa/meetsquid.dxa -t 2 -pix_fmt 
rgb24
+
 FATE_TESTS += fate-dxa-scummvm
 fate-dxa-scummvm: CMD = framecrc -i $(SAMPLES)/dxa/scummvm.dxa -pix_fmt rgb24
 
-FATE_TESTS += fate-feeble-dxa
-fate-feeble-dxa: CMD = framecrc -i $(SAMPLES)/dxa/meetsquid.dxa -t 2 -pix_fmt 
rgb24
-
 FATE_TESTS += fate-flic-af11-palette-change
 fate-flic-af11-palette-change: CMD = framecrc -i 
$(SAMPLES)/fli/fli-engines.fli -t 3.3 -pix_fmt rgb24
 
@@ -145,12 +154,6 @@ fate-tiertex-seq: CMD = framecrc -i 
$(SAMPLES)/tiertex-seq/Gameover.seq -pix_fmt
 FATE_TESTS += fate-tmv
 fate-tmv: CMD = framecrc -i $(SAMPLES)/tmv/pop-partial.tmv -pix_fmt rgb24
 
-FATE_TESTS += fate-truemotion1-15
-fate-truemotion1-15: CMD = framecrc -i $(SAMPLES)/duck/phant2-940.duk -pix_fmt 
rgb24
-
-FATE_TESTS += fate-truemotion1-24
-fate-truemotion1-24: CMD = framecrc -i 
$(SAMPLES)/duck/sonic3dblast_intro-partial.avi -pix_fmt rgb24
-
 FATE_TESTS += fate-txd-16bpp
 fate-txd-16bpp: CMD = framecrc -i $(SAMPLES)/txd/misc.txd -pix_fmt bgra -an
 
@@ -173,8 +176,8 @@ fate-v410enc: CMD = md5 -f image2 -vcodec pgmyuv -i 
$(TARGET_PATH)/tests/vsynth1
 FATE_TESTS += fate-vcr1
 fate-vcr1: CMD = framecrc -i $(SAMPLES)/vcr1/VCR1test.avi -an
 
-FATE_TESTS += fate-video-xl
-fate-video-xl: CMD = framecrc -i $(SAMPLES)/vixl/pig-vixl.avi
+FATE_TESTS += fate-videoxl
+fate-videoxl: CMD = framecrc -i $(SAMPLES)/vixl/pig-vixl.avi
 
 FATE_TESTS += fate-vqa-cc
 fate-vqa-cc: CMD = framecrc -i $(SAMPLES)/vqa/cc-demo1-partial.vqa -pix_fmt 
rgb24
diff --git a/tests/fate/voice.mak b/tests/fate/voice.mak
index 51cc2ae..583c605 100644
--- a/tests/fate/voice.mak
+++ b/tests/fate/voice.mak
@@ -5,12 +5,12 @@ FATE_TESTS += 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_TESTS += fate-gsm
-fate-gsm: CMD = framecrc -i $(SAMPLES)/gsm/sample-gsm-8000.mov -t 10
-
 FATE_TESTS += fate-gsm-ms
 fate-gsm-ms: CMD = framecrc -i $(SAMPLES)/gsm/ciao.wav
 
+FATE_TESTS += fate-gsm-toast
+fate-gsm-toast: CMD = framecrc -i $(SAMPLES)/gsm/sample-gsm-8000.mov -t 10
+
 FATE_TESTS += fate-qcelp
 fate-qcelp: CMD = pcm -i $(SAMPLES)/qcp/0036580847.QCP
 fate-qcelp: CMP = oneoff
diff --git a/tests/fate/vpx.mak b/tests/fate/vpx.mak
index 2d1c8fd..df6c4ab 100644
--- a/tests/fate/vpx.mak
+++ b/tests/fate/vpx.mak
@@ -4,8 +4,8 @@ fate-ea-vp60: CMD = framecrc -i $(SAMPLES)/ea-vp6/g36.vp6
 FATE_TESTS += fate-ea-vp61
 fate-ea-vp61: CMD = framecrc -i $(SAMPLES)/ea-vp6/MovieSkirmishGondor.vp6 -t 4
 
-FATE_TESTS += fate-vp3
-fate-vp3: CMD = framecrc -i $(SAMPLES)/vp3/vp31.avi
+FATE_TESTS += fate-vp31
+fate-vp31: CMD = framecrc -i $(SAMPLES)/vp3/vp31.avi
 
 FATE_TESTS += fate-vp3-coeff-level64
 fate-vp3-coeff-level64: CMD = framecrc -i $(SAMPLES)/vp3/coeff_level64.mkv
diff --git a/tests/ref/fate/creative-adpcm b/tests/ref/fate/adpcm-creative
similarity index 100%
rename from tests/ref/fate/creative-adpcm
rename to tests/ref/fate/adpcm-creative
diff --git a/tests/ref/fate/creative-adpcm-8-2.6bit 
b/tests/ref/fate/adpcm-creative-8-2.6bit
similarity index 100%
rename from tests/ref/fate/creative-adpcm-8-2.6bit
rename to tests/ref/fate/adpcm-creative-8-2.6bit
diff --git a/tests/ref/fate/creative-adpcm-8-2bit 
b/tests/ref/fate/adpcm-creative-8-2bit
similarity index 100%
rename from tests/ref/fate/creative-adpcm-8-2bit
rename to tests/ref/fate/adpcm-creative-8-2bit
diff --git a/tests/ref/fate/creative-adpcm-8-4bit 
b/tests/ref/fate/adpcm-creative-8-4bit
similarity index 100%
rename from tests/ref/fate/creative-adpcm-8-4bit
rename to tests/ref/fate/adpcm-creative-8-4bit
diff --git a/tests/ref/fate/ea-mad-adpcm-ea-r1 
b/tests/ref/fate/adpcm-ea-mad-ea-r1
similarity index 100%
rename from tests/ref/fate/ea-mad-adpcm-ea-r1
rename to tests/ref/fate/adpcm-ea-mad-ea-r1
diff --git a/tests/ref/fate/ea-tqi-adpcm b/tests/ref/fate/adpcm-ea-tqi
similarity index 100%
rename from tests/ref/fate/ea-tqi-adpcm
rename to tests/ref/fate/adpcm-ea-tqi
diff --git a/tests/ref/fate/duck-dk3 b/tests/ref/fate/adpcm-ima-dk3
similarity index 100%
rename from tests/ref/fate/duck-dk3
rename to tests/ref/fate/adpcm-ima-dk3
diff --git a/tests/ref/fate/duck-dk4 b/tests/ref/fate/adpcm-ima-dk4
similarity index 100%
rename from tests/ref/fate/duck-dk4
rename to tests/ref/fate/adpcm-ima-dk4
diff --git a/tests/ref/fate/psx-str-v3-adpcm_xa 
b/tests/ref/fate/adpcm-psx-str-v3
similarity index 100%
rename from tests/ref/fate/psx-str-v3-adpcm_xa
rename to tests/ref/fate/adpcm-psx-str-v3
diff --git a/tests/ref/fate/thp-mjpeg-adpcm b/tests/ref/fate/adpcm-thp
similarity index 100%
rename from tests/ref/fate/thp-mjpeg-adpcm
rename to tests/ref/fate/adpcm-thp
diff --git a/tests/ref/fate/auravision b/tests/ref/fate/auravision-v1
similarity index 100%
rename from tests/ref/fate/auravision
rename to tests/ref/fate/auravision-v1
diff --git a/tests/ref/fate/bink-demux-video b/tests/ref/fate/bink-video
similarity index 100%
rename from tests/ref/fate/bink-demux-video
rename to tests/ref/fate/bink-video
diff --git a/tests/ref/fate/cvid b/tests/ref/fate/cvid-partial
similarity index 100%
rename from tests/ref/fate/cvid
rename to tests/ref/fate/cvid-partial
diff --git a/tests/ref/fate/idroq-video-dpcm b/tests/ref/fate/dpcm-idroq
similarity index 100%
rename from tests/ref/fate/idroq-video-dpcm
rename to tests/ref/fate/dpcm-idroq
diff --git a/tests/ref/fate/sierra-audio b/tests/ref/fate/dpcm-sierra
similarity index 100%
rename from tests/ref/fate/sierra-audio
rename to tests/ref/fate/dpcm-sierra
diff --git a/tests/ref/fate/truemotion1-15 b/tests/ref/fate/duck-tm1-15
similarity index 100%
rename from tests/ref/fate/truemotion1-15
rename to tests/ref/fate/duck-tm1-15
diff --git a/tests/ref/fate/truemotion1-24 b/tests/ref/fate/duck-tm1-24
similarity index 100%
rename from tests/ref/fate/truemotion1-24
rename to tests/ref/fate/duck-tm1-24
diff --git a/tests/ref/fate/feeble-dxa b/tests/ref/fate/dxa-feeble
similarity index 100%
rename from tests/ref/fate/feeble-dxa
rename to tests/ref/fate/dxa-feeble
diff --git a/tests/ref/fate/gsm b/tests/ref/fate/gsm-toast
similarity index 100%
rename from tests/ref/fate/gsm
rename to tests/ref/fate/gsm-toast
diff --git a/tests/ref/fate/lossless-appleaudio b/tests/ref/fate/lossless-alac
similarity index 100%
rename from tests/ref/fate/lossless-appleaudio
rename to tests/ref/fate/lossless-alac
diff --git a/tests/ref/fate/lossless-shortenaudio 
b/tests/ref/fate/lossless-shorten
similarity index 100%
rename from tests/ref/fate/lossless-shortenaudio
rename to tests/ref/fate/lossless-shorten
diff --git a/tests/ref/fate/lossless-wavpackaudio 
b/tests/ref/fate/lossless-wavpack
similarity index 100%
rename from tests/ref/fate/lossless-wavpackaudio
rename to tests/ref/fate/lossless-wavpack
diff --git a/tests/ref/fate/qt-msadpcm-stereo b/tests/ref/fate/msadpcm-stereo
similarity index 100%
rename from tests/ref/fate/qt-msadpcm-stereo
rename to tests/ref/fate/msadpcm-stereo
diff --git a/tests/ref/fate/qt-msimaadpcm-stereo 
b/tests/ref/fate/msimaadpcm-stereo
similarity index 100%
rename from tests/ref/fate/qt-msimaadpcm-stereo
rename to tests/ref/fate/msimaadpcm-stereo
diff --git a/tests/ref/fate/qt-rawpcm-16bit-stereo-signed-be 
b/tests/ref/fate/pcm-16bit-stereo-signed-be
similarity index 100%
rename from tests/ref/fate/qt-rawpcm-16bit-stereo-signed-be
rename to tests/ref/fate/pcm-16bit-stereo-signed-be
diff --git a/tests/ref/fate/qt-rawpcm-16bit-stereo-signed-le 
b/tests/ref/fate/pcm-16bit-stereo-signed-le
similarity index 100%
rename from tests/ref/fate/qt-rawpcm-16bit-stereo-signed-le
rename to tests/ref/fate/pcm-16bit-stereo-signed-le
diff --git a/tests/ref/fate/qt-rawpcm-8bit-mono-unsigned 
b/tests/ref/fate/pcm-8bit-mono-unsigned
similarity index 100%
rename from tests/ref/fate/qt-rawpcm-8bit-mono-unsigned
rename to tests/ref/fate/pcm-8bit-mono-unsigned
diff --git a/tests/ref/fate/qt-rawpcm-8bit-stereo-unsigned 
b/tests/ref/fate/pcm-8bit-stereo-unsigned
similarity index 100%
rename from tests/ref/fate/qt-rawpcm-8bit-stereo-unsigned
rename to tests/ref/fate/pcm-8bit-stereo-unsigned
diff --git a/tests/ref/fate/pcm_dvd b/tests/ref/fate/pcm-dvd
similarity index 100%
rename from tests/ref/fate/pcm_dvd
rename to tests/ref/fate/pcm-dvd
diff --git a/tests/ref/fate/ea-mad-pcm-planar b/tests/ref/fate/pcm-ea-mad
similarity index 100%
rename from tests/ref/fate/ea-mad-pcm-planar
rename to tests/ref/fate/pcm-ea-mad
diff --git a/tests/ref/fate/film-cvid-pcm-stereo-8bit 
b/tests/ref/fate/pcm-film-stereo-8bit
similarity index 100%
rename from tests/ref/fate/film-cvid-pcm-stereo-8bit
rename to tests/ref/fate/pcm-film-stereo-8bit
diff --git a/tests/ref/fate/iff-pcm b/tests/ref/fate/pcm-iff
similarity index 100%
rename from tests/ref/fate/iff-pcm
rename to tests/ref/fate/pcm-iff
diff --git a/tests/ref/fate/w64 b/tests/ref/fate/pcm-w64
similarity index 100%
rename from tests/ref/fate/w64
rename to tests/ref/fate/pcm-w64
diff --git a/tests/ref/fate/vc1 b/tests/ref/fate/vc1_sa00040
similarity index 100%
rename from tests/ref/fate/vc1
rename to tests/ref/fate/vc1_sa00040
diff --git a/tests/ref/fate/video-xl b/tests/ref/fate/videoxl
similarity index 100%
rename from tests/ref/fate/video-xl
rename to tests/ref/fate/videoxl
diff --git a/tests/ref/fate/vp3 b/tests/ref/fate/vp31
similarity index 100%
rename from tests/ref/fate/vp3
rename to tests/ref/fate/vp31
-- 
1.7.1

_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to