aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-10-20 16:22:50 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-10-20 16:36:52 +0200
commite6e86e64c34dcf91d6b75b91accc998bd02fcd51 (patch)
tree781e3c746a036e2bfb884a6692405f4284cac2e1
parent43fce2214b1c9d0d3cbcc84f06238a63081e07fb (diff)
downloadffmpeg-e6e86e64c34dcf91d6b75b91accc998bd02fcd51.tar.gz
presets: favor vprofile over profile to avoid conflicts with audio profiles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--presets/libvpx-1080p.ffpreset2
-rw-r--r--presets/libvpx-1080p50_60.ffpreset2
-rw-r--r--presets/libvpx-360p.ffpreset2
-rw-r--r--presets/libvpx-720p.ffpreset2
-rw-r--r--presets/libvpx-720p50_60.ffpreset2
-rw-r--r--presets/libx264-baseline.ffpreset2
-rw-r--r--presets/libx264-ipod320.ffpreset2
-rw-r--r--presets/libx264-ipod640.ffpreset2
-rw-r--r--presets/libx264-main.ffpreset2
9 files changed, 9 insertions, 9 deletions
diff --git a/presets/libvpx-1080p.ffpreset b/presets/libvpx-1080p.ffpreset
index 5c7da6fb86..a2accba7ff 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 d42f731744..b556f68f6d 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 2cb9e380f3..36fd11af43 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 3c7e396ad6..ba7791d544 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 613930063e..b339774e78 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 0626e28440..0d48958437 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 6323191740..6abacbd72c 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 c2c3e1a88e..cda7c08752 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 336c69b3af..4b82efc464 100644
--- a/presets/libx264-main.ffpreset
+++ b/presets/libx264-main.ffpreset
@@ -1 +1 @@
-profile=main
+vprofile=main