RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'e17db9ac496420f8824190ff5059a8a3646cbb7e' 

* commit 'e17db9ac496420f8824190ff5059a8a3646cbb7e':
  fate: Move mv0 option from global to mpv private

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-09-16 11:14:37 +02:00
parent a600e7145f e17db9ac49
commit 25a7c2aed6
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/fate/vcodec.mak
View File

@ -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