presets: favor vprofile over profile to avoid conflicts with audio profiles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pull/2/head
Michael Niedermayer 13 years ago
parent 43fce2214b
commit e6e86e64c3
  1. 2
      presets/libvpx-1080p.ffpreset
  2. 2
      presets/libvpx-1080p50_60.ffpreset
  3. 2
      presets/libvpx-360p.ffpreset
  4. 2
      presets/libvpx-720p.ffpreset
  5. 2
      presets/libvpx-720p50_60.ffpreset
  6. 2
      presets/libx264-baseline.ffpreset
  7. 2
      presets/libx264-ipod320.ffpreset
  8. 2
      presets/libx264-ipod640.ffpreset
  9. 2
      presets/libx264-main.ffpreset

@ -2,7 +2,7 @@ g=120
lag-in-frames=16
deadline=good
cpu-used=0
profile=1
vprofile=1
qmax=51
qmin=11
slices=4

@ -2,7 +2,7 @@ g=120
lag-in-frames=25
deafline=good
cpu-used=0
profile=1
vprofile=1
qmax=51
qmin=11
slices=4

@ -2,7 +2,7 @@ g=120
lag-in-frames=16
deadline=good
cpu-used=0
profile=0
vprofile=0
qmax=63
qmin=0
b=768k

@ -2,7 +2,7 @@ g=120
lag-in-frames=16
deadline=good
cpu-used=0
profile=0
vprofile=0
qmax=51
qmin=11
slices=4

@ -2,7 +2,7 @@ g=120
lag-in-frames=25
deadline=good
cpu-used=0
profile=0
vprofile=0
qmax=51
qmin=11
slices=4

@ -1 +1 @@
profile=baseline
vprofile=baseline

@ -1,4 +1,4 @@
profile=baseline
vprofile=baseline
level=13
maxrate=768000
bufsize=3000000

@ -1,4 +1,4 @@
profile=baseline
vprofile=baseline
level=30
maxrate=10000000
bufsize=10000000

@ -1 +1 @@
profile=main
vprofile=main

Loading…
Cancel
Save