diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-16 11:14:37 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-16 11:14:37 +0200 |
| commit | 25a7c2aed6f4eec05c771e047f418e31610170c7 (patch) | |
| tree | c6a27f6146a34088996f5d4a3ef13288f8ac33f0 /tests | |
| parent | a600e7145f9e32365714e4e289446706661ea4c1 (diff) | |
| parent | e17db9ac496420f8824190ff5059a8a3646cbb7e (diff) | |
| download | ffmpeg-25a7c2aed6f4eec05c771e047f418e31610170c7.tar.gz | |
Merge commit 'e17db9ac496420f8824190ff5059a8a3646cbb7e'
* commit 'e17db9ac496420f8824190ff5059a8a3646cbb7e':
fate: Move mv0 option from global to mpv private
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/vcodec.mak | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index 310352ecdf..e3edcae358 100644 --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@ -203,9 +203,9 @@ 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 \ - -mpv_flags +mv0 \ -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 \ @@ -225,9 +225,8 @@ 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 -mpv_flags +qp_rd \ - -cmp 2 -subcmp 2 -mbd rd \ - -mpv_flags +mv0 + -flags +mv4 -mpv_flags +qp_rd+mv0 \ + -cmp 2 -subcmp 2 -mbd rd fate-vsynth%-mpeg4-rc: ENCOPTS = -b 400k -bf 2 |