fate: mp3: drop redundant CMP setting

[ffmpeg] / tests / fate / demux.mak

diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak
index edf7ad0ca1ff6624b6356ef9082f8e7646046004..d9fe6296ef941ea202b79c571172e3a5414d15ec 100644 (file)
--- a/tests/fate/demux.mak
+++ b/tests/fate/demux.mak
@@ -1,77 +1,71 @@
-FATE_AVCONV += fate-adts-demux
+FATE_SAMPLES_AVCONV += fate-adts-demux
 fate-adts-demux: CMD = crc -i $(SAMPLES)/aac/ct_faac-adts.aac -acodec copy
 
-FATE_AVCONV += fate-aea-demux
+FATE_SAMPLES_AVCONV += fate-aea-demux
 fate-aea-demux: CMD = crc -i $(SAMPLES)/aea/chirp.aea -acodec copy
 
-FATE_AVCONV += fate-bink-demux
+FATE_SAMPLES_AVCONV += fate-bink-demux
 fate-bink-demux: CMD = crc -i $(SAMPLES)/bink/Snd0a7d9b58.dee -vn -acodec copy
 
-FATE_AVCONV += fate-caf
+FATE_SAMPLES_AVCONV += fate-caf
 fate-caf: CMD = crc -i $(SAMPLES)/caf/caf-pcm16.caf -c copy
 
-FATE_AVCONV += fate-cdxl-demux
+FATE_SAMPLES_AVCONV += fate-cdxl-demux
 fate-cdxl-demux: CMD = framecrc -i $(SAMPLES)/cdxl/mirage.cdxl -vcodec copy -acodec copy
 
-FATE_AVCONV += fate-d-cinema-demux
+FATE_SAMPLES_AVCONV += fate-d-cinema-demux
 fate-d-cinema-demux: CMD = framecrc -i $(SAMPLES)/d-cinema/THX_Science_FLT_1920-partial.302 -acodec copy
 
-FATE_AVCONV += fate-iv8-demux
+FATE_SAMPLES_AVCONV += fate-iv8-demux
 fate-iv8-demux: CMD = framecrc -i $(SAMPLES)/iv8/zzz-partial.mpg -vcodec copy
 
-FATE_AVCONV += fate-lmlm4-demux
+FATE_SAMPLES_AVCONV += fate-lmlm4-demux
 fate-lmlm4-demux: CMD = framecrc -i $(SAMPLES)/lmlm4/LMLM4_CIFat30fps.divx -t 3 -acodec copy -vcodec copy
 
-FATE_AVCONV += fate-maxis-xa
+FATE_SAMPLES_AVCONV += fate-maxis-xa
 fate-maxis-xa: CMD = framecrc -i $(SAMPLES)/maxis-xa/SC2KBUG.XA -frames:a 30 -c:a copy
 
-FATE_AVCONV += fate-mtv
+FATE_SAMPLES_AVCONV += fate-mtv
 fate-mtv: CMD = framecrc -i $(SAMPLES)/mtv/comedian_auto-partial.mtv -c copy
 
-FATE_AVCONV += fate-mxf-demux
+FATE_SAMPLES_AVCONV += fate-mxf-demux
 fate-mxf-demux: CMD = framecrc -i $(SAMPLES)/mxf/C0023S01.mxf -acodec copy -vcodec copy
 
-FATE_AVCONV += fate-nc-demux
+FATE_SAMPLES_AVCONV += fate-nc-demux
 fate-nc-demux: CMD = framecrc -i $(SAMPLES)/nc-camera/nc-sample-partial -vcodec copy
 
-FATE_AVCONV += fate-nsv-demux
+FATE_SAMPLES_AVCONV += fate-nsv-demux
 fate-nsv-demux: CMD = framecrc -i $(SAMPLES)/nsv/witchblade-51kbps.nsv -t 6 -vcodec copy -acodec copy
 
-FATE_AVCONV += fate-oma-demux
+FATE_SAMPLES_AVCONV += fate-oma-demux
 fate-oma-demux: CMD = crc -i $(SAMPLES)/oma/01-Untitled-partial.oma -acodec copy
 
-FATE_AVCONV += fate-psx-str
-fate-psx-str: CMD = framecrc -i $(SAMPLES)/psx-str/descent-partial.str
+FATE_SAMPLES_AVCONV += fate-psx-str-demux
+fate-psx-str-demux: CMD = framecrc -i $(SAMPLES)/psx-str/descent-partial.str -c copy
 
-FATE_AVCONV += fate-psx-str-v3-mdec
-fate-psx-str-v3-mdec: CMD = framecrc -i $(SAMPLES)/psx-str/abc000_cut.str -an
-
-FATE_AVCONV += fate-pva-demux
+FATE_SAMPLES_AVCONV += fate-pva-demux
 fate-pva-demux: CMD = framecrc -idct simple -i $(SAMPLES)/pva/PVA_test-partial.pva -t 0.6 -acodec copy -vn
 
-FATE_AVCONV += fate-qcp-demux
+FATE_SAMPLES_AVCONV += fate-qcp-demux
 fate-qcp-demux: CMD = crc -i $(SAMPLES)/qcp/0036580847.QCP -acodec copy
 
-FATE_AVCONV += fate-redcode-demux
+FATE_SAMPLES_AVCONV += fate-redcode-demux
 fate-redcode-demux: CMD = framecrc -i $(SAMPLES)/r3d/4MB-sample.r3d -vcodec copy -acodec copy
 
-FATE_AVCONV += fate-sierra-vmd
-fate-sierra-vmd: CMD = framecrc -i $(SAMPLES)/vmd/12.vmd -pix_fmt rgb24
-
-FATE_AVCONV += fate-siff
+FATE_SAMPLES_AVCONV += fate-siff
 fate-siff: CMD = framecrc -i $(SAMPLES)/SIFF/INTRO_B.VB -t 3 -pix_fmt rgb24
 
-FATE_AVCONV += fate-smjpeg
-fate-smjpeg: CMD = framecrc -i $(SAMPLES)/smjpeg/scenwin.mjpg -vcodec copy
+FATE_SAMPLES_AVCONV += fate-smjpeg-demux
+fate-smjpeg-demux: CMD = framecrc -i $(SAMPLES)/smjpeg/scenwin.mjpg -c copy
 
-FATE_AVCONV += fate-westwood-aud
-fate-westwood-aud: CMD = md5 -i $(SAMPLES)/westwood-aud/excellent.aud -f s16le
+FATE_SAMPLES_AVCONV += fate-westwood-aud
+fate-westwood-aud: CMD = framecrc -i $(SAMPLES)/westwood-aud/excellent.aud -c copy
 
-FATE_AVCONV += fate-wtv-demux
+FATE_SAMPLES_AVCONV += fate-wtv-demux
 fate-wtv-demux: CMD = framecrc -i $(SAMPLES)/wtv/law-and-order-partial.wtv -vcodec copy -acodec copy
 
-FATE_AVCONV += fate-xmv-demux
+FATE_SAMPLES_AVCONV += fate-xmv-demux
 fate-xmv-demux: CMD = framecrc -i $(SAMPLES)/xmv/logos1p.fmv -vcodec copy -acodec copy
 
-FATE_AVCONV += fate-xwma-demux
+FATE_SAMPLES_AVCONV += fate-xwma-demux
 fate-xwma-demux: CMD = crc -i $(SAMPLES)/xwma/ergon.xwma -acodec copy