From e17db9ac496420f8824190ff5059a8a3646cbb7e Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Thu, 10 Sep 2015 17:05:52 +0200 Subject: [PATCH] fate: Move mv0 option from global to mpv private --- tests/fate/vcodec.mak | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index ed9fa2e78f..6487e12e55 100644 --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@ -114,8 +114,8 @@ fate-vsynth%-mpeg2: ENCOPTS = -qscale 10 fate-vsynth%-mpeg2-422: ENCOPTS = -b:v 1000k \ -bf 2 \ -trellis 1 \ - -flags +mv0+ildct+ilme \ - -mpv_flags +qp_rd \ + -flags +ildct+ilme \ + -mpv_flags +qp_rd+mv0 \ -intra_vlc 1 \ -mbd rd \ -pix_fmt yuv422p @@ -124,8 +124,7 @@ fate-vsynth%-mpeg2-ilace: ENCOPTS = -qscale 10 -flags +ildct+ilme fate-vsynth%-mpeg2-ivlc-qprd: ENCOPTS = -b:v 500k \ -bf 2 \ -trellis 1 \ - -flags +mv0 \ - -mpv_flags +qp_rd \ + -mpv_flags +qp_rd+mv0 \ -intra_vlc 1 \ -cmp 2 -subcmp 2 \ -mbd rd @@ -150,9 +149,10 @@ FATE_VCODEC-$(call ENCDEC, MPEG4, AVI) += $(FATE_MPEG4_AVI) fate-vsynth%-mpeg4: ENCOPTS = -qscale 10 -flags +mv4 -mbd bits fate-vsynth%-mpeg4: FMT = mp4 -fate-vsynth%-mpeg4-adap: ENCOPTS = -b 550k -bf 2 -flags +mv4+mv0 \ +fate-vsynth%-mpeg4-adap: ENCOPTS = -b 550k -bf 2 -flags +mv4 \ -trellis 1 -cmp 1 -subcmp 2 \ - -mbd rd -scplx_mask 0.3 + -mbd rd -scplx_mask 0.3 \ + -mpv_flags +mv0 fate-vsynth%-mpeg4-adv: ENCOPTS = -qscale 9 -flags +mv4+aic \ -data_partitioning 1 -trellis 1 \ @@ -168,7 +168,7 @@ fate-vsynth%-mpeg4-qpel: ENCOPTS = -qscale 7 -flags +mv4+qpel -mbd 2 \ -bf 2 -cmp 1 -subcmp 2 fate-vsynth%-mpeg4-qprd: ENCOPTS = -b 450k -bf 2 -trellis 1 \ - -flags +mv4+mv0 -mpv_flags +qp_rd \ + -flags +mv4 -mpv_flags +qp_rd+mv0 \ -cmp 2 -subcmp 2 -mbd rd fate-vsynth%-mpeg4-rc: ENCOPTS = -b 400k -bf 2