summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRudolf Polzer <divverent@xonotic.org>2013-01-10 11:56:04 +0100
committerRudolf Polzer <divverent@xonotic.org>2013-01-10 11:56:04 +0100
commit015548401c3eca281fd87984843353089e73f9a3 (patch)
tree08b2402cd5f51b04f7b2331ce037569cb34b73ba
parentf96dd88b41d5786afd181b833d62d1b1bcfcee10 (diff)
downloadmpv-015548401c3eca281fd87984843353089e73f9a3.tar.bz2
mpv-015548401c3eca281fd87984843353089e73f9a3.tar.xz
encoding-example-profiles: restructure iPhone profiles
The names are left as is, but they are hierarchic internally now.
-rw-r--r--etc/encoding-example-profiles.conf22
1 files changed, 11 insertions, 11 deletions
diff --git a/etc/encoding-example-profiles.conf b/etc/encoding-example-profiles.conf
index 6a688f4539..c2a07af2e8 100644
--- a/etc/encoding-example-profiles.conf
+++ b/etc/encoding-example-profiles.conf
@@ -171,23 +171,23 @@ srate = 48000
channels = 2
ovcopts-add = b=512k,profile=baseline
-[enc-to-iphone]
-profile-desc = "MP4 for iPhone"
+[enc-to-iphone-noscale]
+profile-desc = "MP4 for iPhone (no scaling)"
profile = enc-f-mp4
oautofps = yes # iphone supports 30fps max
-vf-add = dsize=480:320:1:2,scale=w=0:h=0,dsize=-1:-1 # half native screen res is probably best here, full res is no fun on tiny display anyway
ovcopts-add = maxrate=2500k,bufsize=1000k,rc_init_occupancy=900k,level=30,profile=baseline
+[enc-to-iphone]
+profile-desc = "MP4 for iPhone (480x320)"
+profile = enc-to-iphone
+vf-add = dsize=480:320:1:2,scale=w=0:h=0,dsize=-1:-1 # panscan
+
[enc-to-iphone-4]
profile-desc = "MP4 for iPhone 4 (960x640)"
-profile = enc-f-mp4
-oautofps = yes # iphone supports 30fps max
-vf-add = dsize=960:480:1:2,scale=w=0:h=0,dsize=-1:-1 # native screen res, panscan
-ovcopts-add = maxrate=2500k,bufsize=1000k,rc_init_occupancy=900k,level=30,profile=baseline
+profile = enc-to-iphone
+vf-add = dsize=960:480:1:2,scale=w=0:h=0,dsize=-1:-1 # panscan
[enc-to-iphone-5]
profile-desc = "MP4 for iPhone 5 (1136x640)"
-profile = enc-f-mp4
-oautofps = yes # iphone supports 30fps max
-vf-add = dsize=1136:480:1:2,scale=w=0:h=0,dsize=-1:-1 # native screen res, panscan
-ovcopts-add = maxrate=2500k,bufsize=1000k,rc_init_occupancy=900k,level=30,profile=baseline
+profile = enc-to-iphone
+vf-add = dsize=1136:480:1:2,scale=w=0:h=0,dsize=-1:-1 # panscan