summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2022-05-12 09:36:05 +0200
committerAnton Khirnov <anton@khirnov.net>2022-05-24 13:35:16 +0200
commitaa7d38f27caf9545118ad347e09876cc08dfd4e0 (patch)
treed5c57b31058be850a3e9d1d12db60a6cb63ca1b5 /tests
parent5a7a33f6f24e08470bfce2dee020da7b2f6a9b50 (diff)
downloadffmpeg-aa7d38f27caf9545118ad347e09876cc08dfd4e0.tar.gz
tests/fate/vcodec: drop unnecessary options
jpeg2000 will be chosen by default, there is no reason to prescribe it explicitly. No other test does so.
Diffstat (limited to 'tests')
-rw-r--r--tests/fate/vcodec.mak4
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak
index 3c9b7f1ff7..c19fb8633a 100644
--- a/tests/fate/vcodec.mak
+++ b/tests/fate/vcodec.mak
@@ -6,7 +6,7 @@ fate-vsynth%: CODEC = $(word 3, $(subst -, ,$(@)))
fate-vsynth%: FMT = avi
fate-vsynth%: DEFAULT_SIZE = -s 352x288
fate-vsynth3-%: DEFAULT_SIZE = -s $(FATEW)x$(FATEH)
-fate-vsynth%: CMD = enc_dec "rawvideo $(DEFAULT_SIZE) -pix_fmt yuv420p $(RAWDECOPTS)" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-pix_fmt yuv420p -vsync passthrough $(DECOPTS)" "$(DECINOPTS)"
+fate-vsynth%: CMD = enc_dec "rawvideo $(DEFAULT_SIZE) -pix_fmt yuv420p $(RAWDECOPTS)" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-pix_fmt yuv420p -vsync passthrough $(DECOPTS)"
fate-vsynth%: CMP_UNIT = 1
fate-vsynth%: REF = $(SRC_PATH)/tests/ref/vsynth/$(@:fate-%=%)
@@ -218,9 +218,7 @@ fate-vsynth%-jpegls: DECOPTS = -sws_flags area
FATE_VCODEC_SCALE-$(call ENCDEC, JPEG2000, AVI) += jpeg2000 jpeg2000-97
fate-vsynth%-jpeg2000: ENCOPTS = -qscale 7 -strict experimental -pred 1 -pix_fmt rgb24
-fate-vsynth%-jpeg2000: DECINOPTS = -c:v jpeg2000
fate-vsynth%-jpeg2000-97: ENCOPTS = -qscale 7 -strict experimental -pix_fmt rgb24
-fate-vsynth%-jpeg2000-97: DECINOPTS = -c:v jpeg2000
FATE_VCODEC-$(call ENCDEC, LJPEG MJPEG, AVI) += ljpeg
fate-vsynth%-ljpeg: ENCOPTS = -strict -1