presets: favor vprofile over profile to avoid conflicts with audio profiles
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Oct 2011 14:22:50 +0000 (16:22 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Oct 2011 14:36:52 +0000 (16:36 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
presets/libvpx-1080p.ffpreset
presets/libvpx-1080p50_60.ffpreset
presets/libvpx-360p.ffpreset
presets/libvpx-720p.ffpreset
presets/libvpx-720p50_60.ffpreset
presets/libx264-baseline.ffpreset
presets/libx264-ipod320.ffpreset
presets/libx264-ipod640.ffpreset
presets/libx264-main.ffpreset

index 5c7da6f..a2accba 100644 (file)
@@ -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
index d42f731..b556f68 100644 (file)
@@ -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
index 2cb9e38..36fd11a 100644 (file)
@@ -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
index 3c7e396..ba7791d 100644 (file)
@@ -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
index 6139300..b339774 100644 (file)
@@ -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
index 6323191..6abacbd 100644 (file)
@@ -1,4 +1,4 @@
-profile=baseline
+vprofile=baseline
 level=13
 maxrate=768000
 bufsize=3000000
index c2c3e1a..cda7c08 100644 (file)
@@ -1,4 +1,4 @@
-profile=baseline
+vprofile=baseline
 level=30
 maxrate=10000000
 bufsize=10000000