diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 19:28:04 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 19:28:04 +0400 |
commit | cf4515ecd985aab899f24a6b7d18432001e670fa (patch) | |
tree | 044e03a1909155a1f27871371b0043c2baa758ed /tests/fate | |
parent | 6ea8a830e8f1eee465174c479840b18b4963d43d (diff) | |
parent | ce378f0dd0c4e5350b3280e6b3e8d6b46fe4b0a3 (diff) |
Merge commit 'ce378f0dd0c4e5350b3280e6b3e8d6b46fe4b0a3'
* commit 'ce378f0dd0c4e5350b3280e6b3e8d6b46fe4b0a3':
fate: Use wmv2 IDCT for wmv2 tests
vorbisdsp: change block_size type from int to intptr_t.
Conflicts:
tests/fate-run.sh
tests/fate/vcodec.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate')
-rw-r--r-- | tests/fate/vcodec.mak | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index f10e80c3e7..b12c112e8d 100644 --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@ -2,7 +2,7 @@ fate-vsynth1-%: SRC = tests/data/vsynth1.yuv fate-vsynth2-%: SRC = tests/data/vsynth2.yuv fate-vsynth%: CODEC = $(word 3, $(subst -, ,$(@))) fate-vsynth%: FMT = avi -fate-vsynth%: CMD = enc_dec "rawvideo -s 352x288 -pix_fmt yuv420p $(RAWDECOPTS)" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-s 352x288 -pix_fmt yuv420p -vsync 0 $(DECOPTS)" -keep "$(DECINOPTS)" +fate-vsynth%: CMD = enc_dec "rawvideo -s 352x288 -pix_fmt yuv420p $(RAWDECOPTS)" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-s 352x288 -pix_fmt yuv420p -vsync 0 $(DECOPTS)" -keep "$(DDCOPTS)" fate-vsynth%: CMP_UNIT = 1 fate-vsynth%: REF = $(SRC_PATH)/tests/ref/vsynth/$(@:fate-%=%) @@ -91,7 +91,7 @@ fate-vsynth%-jpegls: DECOPTS = -sws_flags area FATE_VCODEC-$(call ENCDEC, JPEG2000, AVI) += j2k fate-vsynth%-j2k: ENCOPTS = -qscale 7 -strict experimental -pix_fmt rgb24 -fate-vsynth%-j2k: DECINOPTS = -vcodec j2k -strict experimental +fate-vsynth%-j2k: DDCOPTS = -vcodec j2k -strict experimental FATE_VCODEC-$(call ENCDEC, LJPEG MJPEG, AVI) += ljpeg fate-vsynth%-ljpeg: ENCOPTS = -strict -1 @@ -268,7 +268,8 @@ FATE_VCODEC-$(call ENCDEC, WMV1, AVI) += wmv1 fate-vsynth%-wmv1: ENCOPTS = -qscale 10 FATE_VCODEC-$(call ENCDEC, WMV2, AVI) += wmv2 -fate-vsynth%-wmv2: ENCOPTS = -qscale 10 +fate-vsynth%-wmv2: DDCOPTS = -idct auto +fate-vsynth%-wmv2: ENCOPTS = -qscale 10 -idct auto FATE_VCODEC-$(call ENCDEC, RAWVIDEO, AVI) += yuv fate-vsynth%-yuv: CODEC = rawvideo |