From 9fbae45cd65aa5ce84804c6168ab3aa7cdf4f590 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Fri, 29 Apr 2022 00:47:50 +0200 Subject: [PATCH] fate/gif: Fix test requirements Signed-off-by: Andreas Rheinhardt --- tests/fate/gif.mak | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/fate/gif.mak b/tests/fate/gif.mak index a5147c0e38..bf604464aa 100644 --- a/tests/fate/gif.mak +++ b/tests/fate/gif.mak @@ -13,18 +13,17 @@ fate-gif-gray: CMD = framecrc -i $(TARGET_SAMPLES)/gif/Newtons_cradle_animation_ FATE_GIF += fate-gif-deal fate-gif-deal: CMD = framecrc -i $(TARGET_SAMPLES)/gif/deal.gif -vsync cfr -pix_fmt bgra -auto_conversion_filters +FATE_GIF-$(call FRAMECRC, GIF, GIF, SCALE_FILTER) += $(FATE_GIF) + fate-gifenc%: fate-gif-color fate-gifenc%: PIXFMT = $(word 3, $(subst -, ,$(@))) fate-gifenc%: SRC = $(TARGET_SAMPLES)/gif/tc217.gif fate-gifenc%: CMD = framecrc -i $(SRC) -c:v gif -pix_fmt $(PIXFMT) -sws_flags +accurate_rnd+bitexact -vf scale FATE_GIF_ENC_PIXFMT = rgb8 bgr8 rgb4_byte bgr4_byte gray pal8 -FATE_GIF_ENC-$(call ENCDEC, GIF, GIF) = $(FATE_GIF_ENC_PIXFMT:%=fate-gifenc-%) +FATE_GIF_ENC-$(call ENCDEC, GIF, FRAMECRC GIF, SCALE_FILTER PIPE_PROTOCOL) = $(FATE_GIF_ENC_PIXFMT:%=fate-gifenc-%) -FATE_GIF += $(FATE_GIF_ENC-yes) fate-gifenc: $(FATE_GIF_ENC-yes) -FATE_GIF-$(call DEMDEC, GIF, GIF) += $(FATE_GIF) - -FATE_SAMPLES_AVCONV += $(FATE_GIF-yes) -fate-gif: $(FATE_GIF-yes) +FATE_SAMPLES_FFMPEG += $(FATE_GIF-yes) $(FATE_GIF_ENC-yes) +fate-gif: $(FATE_GIF-yes) $(FATE_GIF_ENC-yes)