diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-13 13:42:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-13 13:42:10 +0100 |
| commit | 841a288cb32785400261cbab959fcfb982d3f699 (patch) | |
| tree | 5cdac1ec2a527409495aadfb6d9142b89b398d8b /tests/fate/vcodec.mak | |
| parent | a6e4796fbf0aa9b13451a8ef917ecc4e80d1d272 (diff) | |
| parent | 4d3b144c5ea824193019019d33740a1ae9e0bb69 (diff) | |
Merge commit '4d3b144c5ea824193019019d33740a1ae9e0bb69'
* commit '4d3b144c5ea824193019019d33740a1ae9e0bb69':
fate: cosmetics: Order some test entries
Conflicts:
tests/fate/lossless-video.mak
tests/fate/microsoft.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/vcodec.mak')
| -rw-r--r-- | tests/fate/vcodec.mak | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index 6995c4a230..f10e80c3e7 100644 --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@ -163,34 +163,34 @@ 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-rc: ENCOPTS = -b 400k -bf 2 +fate-vsynth%-mpeg4-adap: ENCOPTS = -b 550k -bf 2 -flags +mv4+mv0 \ + -trellis 1 -cmp 1 -subcmp 2 \ + -mbd rd -scplx_mask 0.3 fate-vsynth%-mpeg4-adv: ENCOPTS = -qscale 9 -flags +mv4+aic \ -data_partitioning 1 -trellis 1 \ -mbd bits -ps 200 -fate-vsynth%-mpeg4-qprd: ENCOPTS = -b 450k -bf 2 -trellis 1 \ - -flags +mv4+mv0 -mpv_flags +qp_rd \ - -cmp 2 -subcmp 2 -mbd rd +fate-vsynth%-mpeg4-error: ENCOPTS = -qscale 7 -flags +mv4+aic \ + -data_partitioning 1 -mbd rd \ + -ps 250 -error 10 -fate-vsynth%-mpeg4-adap: ENCOPTS = -b 550k -bf 2 -flags +mv4+mv0 \ - -trellis 1 -cmp 1 -subcmp 2 \ - -mbd rd -scplx_mask 0.3 +fate-vsynth%-mpeg4-nr: ENCOPTS = -qscale 8 -flags +mv4 -mbd rd -nr 200 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 \ + -cmp 2 -subcmp 2 -mbd rd + +fate-vsynth%-mpeg4-rc: ENCOPTS = -b 400k -bf 2 + fate-vsynth%-mpeg4-thread: ENCOPTS = -b 500k -flags +mv4+aic \ -data_partitioning 1 -trellis 1 \ -mbd bits -ps 200 -bf 2 \ -threads 2 -slices 2 -fate-vsynth%-mpeg4-error: ENCOPTS = -qscale 7 -flags +mv4+aic \ - -data_partitioning 1 -mbd rd \ - -ps 250 -error 10 - -fate-vsynth%-mpeg4-nr: ENCOPTS = -qscale 8 -flags +mv4 -mbd rd -nr 200 - FATE_VCODEC-$(call ENCDEC, MSMPEG4V3, AVI) += msmpeg4 fate-vsynth%-msmpeg4: ENCOPTS = -qscale 10 |