[FFmpeg-cvslog] presets: favor vprofile over profile to avoid conflicts with audio profiles

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Oct 20 16:22:50 2011 +0200| [e6e86e64c34dcf91d6b75b91accc998bd02fcd51] | committer: Michael Niedermayer

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

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e6e86e64c34dcf91d6b75b91accc998bd02fcd51
---

 presets/libvpx-1080p.ffpreset      |    2 +-
 presets/libvpx-1080p50_60.ffpreset |    2 +-
 presets/libvpx-360p.ffpreset       |    2 +-
 presets/libvpx-720p.ffpreset       |    2 +-
 presets/libvpx-720p50_60.ffpreset  |    2 +-
 presets/libx264-baseline.ffpreset  |    2 +-
 presets/libx264-ipod320.ffpreset   |    2 +-
 presets/libx264-ipod640.ffpreset   |    2 +-
 presets/libx264-main.ffpreset      |    2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/presets/libvpx-1080p.ffpreset b/presets/libvpx-1080p.ffpreset
index 5c7da6f..a2accba 100644
--- a/presets/libvpx-1080p.ffpreset
+++ b/presets/libvpx-1080p.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
diff --git a/presets/libvpx-1080p50_60.ffpreset b/presets/libvpx-1080p50_60.ffpreset
index d42f731..b556f68 100644
--- a/presets/libvpx-1080p50_60.ffpreset
+++ b/presets/libvpx-1080p50_60.ffpreset
@@ -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
diff --git a/presets/libvpx-360p.ffpreset b/presets/libvpx-360p.ffpreset
index 2cb9e38..36fd11a 100644
--- a/presets/libvpx-360p.ffpreset
+++ b/presets/libvpx-360p.ffpreset
@@ -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
diff --git a/presets/libvpx-720p.ffpreset b/presets/libvpx-720p.ffpreset
index 3c7e396..ba7791d 100644
--- a/presets/libvpx-720p.ffpreset
+++ b/presets/libvpx-720p.ffpreset
@@ -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
diff --git a/presets/libvpx-720p50_60.ffpreset b/presets/libvpx-720p50_60.ffpreset
index 6139300..b339774 100644
--- a/presets/libvpx-720p50_60.ffpreset
+++ b/presets/libvpx-720p50_60.ffpreset
@@ -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
diff --git a/presets/libx264-baseline.ffpreset b/presets/libx264-baseline.ffpreset
index 0626e28..0d48958 100644
--- a/presets/libx264-baseline.ffpreset
+++ b/presets/libx264-baseline.ffpreset
@@ -1 +1 @@
-profile=baseline
+vprofile=baseline
diff --git a/presets/libx264-ipod320.ffpreset b/presets/libx264-ipod320.ffpreset
index 6323191..6abacbd 100644
--- a/presets/libx264-ipod320.ffpreset
+++ b/presets/libx264-ipod320.ffpreset
@@ -1,4 +1,4 @@
-profile=baseline
+vprofile=baseline
 level=13
 maxrate=768000
 bufsize=3000000
diff --git a/presets/libx264-ipod640.ffpreset b/presets/libx264-ipod640.ffpreset
index c2c3e1a..cda7c08 100644
--- a/presets/libx264-ipod640.ffpreset
+++ b/presets/libx264-ipod640.ffpreset
@@ -1,4 +1,4 @@
-profile=baseline
+vprofile=baseline
 level=30
 maxrate=10000000
 bufsize=10000000
diff --git a/presets/libx264-main.ffpreset b/presets/libx264-main.ffpreset
index 336c69b..4b82efc 100644
--- a/presets/libx264-main.ffpreset
+++ b/presets/libx264-main.ffpreset
@@ -1 +1 @@
-profile=main
+vprofile=main