diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2013-01-21 19:43:53 +0100 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-01-21 19:43:53 +0100 |
| commit | 9146e872c643fb8f20f9043f1b93a3cddfad15c6 (patch) | |
| tree | 11a504275d50138b4c5a7b07d2129900df15fc66 | |
| parent | 4af5310d29379283553bcd9f541a3f6c317f706e (diff) | |
| download | ffmpeg-9146e872c643fb8f20f9043f1b93a3cddfad15c6.tar.gz | |
Revert "fate: Use wmv2 IDCT for wmv2 tests"
This reverts commit ce378f0dd0c4e5350b3280e6b3e8d6b46fe4b0a3.
| -rw-r--r-- | libavcodec/wmv2enc.c | 4 | ||||
| -rwxr-xr-x | tests/fate-run.sh | 3 | ||||
| -rw-r--r-- | tests/fate/vcodec.mak | 5 |
3 files changed, 3 insertions, 9 deletions
diff --git a/libavcodec/wmv2enc.c b/libavcodec/wmv2enc.c index ee6136b265..4643835145 100644 --- a/libavcodec/wmv2enc.c +++ b/libavcodec/wmv2enc.c @@ -55,10 +55,6 @@ static int encode_ext_header(Wmv2Context *w){ static av_cold int wmv2_encode_init(AVCodecContext *avctx){ Wmv2Context * const w= avctx->priv_data; - if(avctx->idct_algo==FF_IDCT_AUTO){ - avctx->idct_algo=FF_IDCT_WMV2; - } - if(ff_MPV_encode_init(avctx) < 0) return -1; diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 9c23b674c8..d1633e8be4 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -128,7 +128,6 @@ enc_dec(){ enc_opt=$4 dec_fmt=$5 dec_opt=$6 - ddc_opt=$8 encfile="${outdir}/${test}.${enc_fmt}" decfile="${outdir}/${test}.out.${dec_fmt}" cleanfiles="$cleanfiles $decfile" @@ -140,7 +139,7 @@ enc_dec(){ -f $enc_fmt -y $tencfile || return do_md5sum $encfile echo $(wc -c $encfile) - avconv $DEC_OPTS $ddc_opt -i $tencfile $ENC_OPTS $dec_opt $FLAGS \ + avconv $DEC_OPTS -i $tencfile $ENC_OPTS $dec_opt $FLAGS \ -f $dec_fmt -y $tdecfile || return do_md5sum $decfile tests/tiny_psnr $srcfile $decfile $cmp_unit $cmp_shift diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index cc33010978..5a5b703b45 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" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-s 352x288 -pix_fmt yuv420p $(DECOPTS)" -keep "$(DDCOPTS)" +fate-vsynth%: CMD = enc_dec "rawvideo -s 352x288 -pix_fmt yuv420p" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-s 352x288 -pix_fmt yuv420p $(DECOPTS)" -keep fate-vsynth%: CMP_UNIT = 1 fate-vsynth%: REF = $(SRC_PATH)/tests/ref/vsynth/$(@:fate-%=%) @@ -218,8 +218,7 @@ FATE_VCODEC-$(call ENCDEC, WMV1, AVI) += wmv1 fate-vsynth%-wmv1: ENCOPTS = -qscale 10 FATE_VCODEC-$(call ENCDEC, WMV2, AVI) += wmv2 -fate-vsynth%-wmv2: DDCOPTS = -idct auto -fate-vsynth%-wmv2: ENCOPTS = -qscale 10 -idct auto +fate-vsynth%-wmv2: ENCOPTS = -qscale 10 FATE_VCODEC-$(call ENCDEC, RAWVIDEO, AVI) += yuv fate-vsynth%-yuv: CODEC = rawvideo |