Merge commit '46aaad78c3cf03d43e7c9ca1d4a8b8a71fb0527d'

[ffmpeg] / tests / fate / cdxl.mak

diff --git a/tests/fate/cdxl.mak b/tests/fate/cdxl.mak
index 86eaa09d0af947f6c9d0cd22ec35423a3406e9f2..8144f96d9448ed44d3b864a3217ed2001b015d27 100644 (file)
--- a/tests/fate/cdxl.mak
+++ b/tests/fate/cdxl.mak
@@ -1,17 +1,19 @@
+FATE_CDXL += fate-cdxl-bitline-ham6
+fate-cdxl-bitline-ham6: CMD = framecrc -i $(TARGET_SAMPLES)/cdxl/bitline.cdxl -frames:v 10
+
 FATE_CDXL += fate-cdxl-ham6
-fate-cdxl-ham6: CMD = framecrc -i $(SAMPLES)/cdxl/cat.cdxl -an -frames:v 16
+fate-cdxl-ham6: CMD = framecrc -i $(TARGET_SAMPLES)/cdxl/cat.cdxl -an -frames:v 16
 
 FATE_CDXL += fate-cdxl-ham8
-fate-cdxl-ham8: CMD = framecrc -i $(SAMPLES)/cdxl/mirage.cdxl -an -frames:v 1
+fate-cdxl-ham8: CMD = framecrc -i $(TARGET_SAMPLES)/cdxl/mirage.cdxl -an -frames:v 1
 
 FATE_CDXL += fate-cdxl-pal8
-fate-cdxl-pal8: CMD = framecrc -i $(SAMPLES)/cdxl/maku.cdxl -pix_fmt rgb24 -frames:v 11
+fate-cdxl-pal8: CMD = framecrc -i $(TARGET_SAMPLES)/cdxl/maku.cdxl -pix_fmt rgb24 -frames:v 11
 
 FATE_CDXL += fate-cdxl-pal8-small
-fate-cdxl-pal8-small: CMD = framecrc -i $(SAMPLES)/cdxl/fruit.cdxl -an -pix_fmt rgb24 -frames:v 46
+fate-cdxl-pal8-small: CMD = framecrc -i $(TARGET_SAMPLES)/cdxl/fruit.cdxl -an -pix_fmt rgb24 -frames:v 46
 
-FATE_CDXL += fate-cdxl-bitline-ham6
-fate-cdxl-bitline-ham6: CMD = framecrc -i $(SAMPLES)/cdxl/bitline.cdxl -frames:v 10
+FATE_CDXL-$(call DEMDEC, CDXL, CDXL) += $(FATE_CDXL)
 
-FATE_SAMPLES_AVCONV += $(FATE_CDXL)
-fate-cdxl: $(FATE_CDXL)
+FATE_SAMPLES_AVCONV += $(FATE_CDXL-yes)
+fate-cdxl: $(FATE_CDXL-yes)