summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorRudolf Polzer <divverent@xonotic.org>2012-09-24 16:06:21 +0200
committerRudolf Polzer <divverent@xonotic.org>2012-09-24 16:41:37 +0200
commit65ea69f56476aabb0755ae80b7dc565df23ab426 (patch)
treef003df239a75e9d2968b6ab71fb933583ad58054 /etc
parent5a3045f1a27e350e919723921d365321e4ef8dfc (diff)
downloadmpv-65ea69f56476aabb0755ae80b7dc565df23ab426.tar.bz2
mpv-65ea69f56476aabb0755ae80b7dc565df23ab426.tar.xz
encoding examples: refuse upscaling when the target is an iPhone
This is ok, because the iPhone can handle any resolution. So there is no need to waste space on upscaling the iPhone can do at playback time as well.
Diffstat (limited to 'etc')
-rw-r--r--etc/encoding-example-profiles.conf14
1 files changed, 7 insertions, 7 deletions
diff --git a/etc/encoding-example-profiles.conf b/etc/encoding-example-profiles.conf
index 5dc2908599..41f9dc4e66 100644
--- a/etc/encoding-example-profiles.conf
+++ b/etc/encoding-example-profiles.conf
@@ -131,7 +131,7 @@ of = dvd
ofopts-add = packetsize=2048,muxrate=10080000
ofps = 25
oharddup = yes
-vf = expand=aspect=4/3,scale=720:576
+vf-add = expand=aspect=4/3,scale=w=720:h=576
srate = 48000
ovcopts-add = g=15,b=6000000,maxrate=9000000,minrate=0,bufsize=1835008
@@ -143,14 +143,14 @@ of = dvd
ofopts-add = packetsize=2048,muxrate=10080000
ofps = 24000/1001
oharddup = yes
-vf-add = expand=aspect=4/3,scale=720:480
+vf-add = expand=aspect=4/3,scale=w=720:h=480
srate = 48000
ovcopts-add = g=18,b=6000000,maxrate=9000000,minrate=0,bufsize=1835008
[enc-to-bb-9000]
profile-desc = "MP4 for Blackberry Bold 9000"
profile = enc-f-mp4
-vf-add = scale=480:-2
+vf-add = scale=w=480:h=-2:noup=2,scale=h=-2 # second scaler serves to fix aspect ratio in case "noup" of the first scaler has hit
ovcopts-add = maxrate=1500k,bufsize=1000k,rc_init_occupancy=900k,refs=1,profile=baseline
oacopts-add = b=96k
@@ -158,7 +158,7 @@ oacopts-add = b=96k
profile-desc = "3GP for Nokia 6300"
profile = enc-f-3gp
ofps = 25
-vf-add = scale=176:144
+vf-add = scale=w=176:h=144
srate = 16000
channels = 1
oacopts-add = b=32k
@@ -167,7 +167,7 @@ oacopts-add = b=32k
profile-desc = "MP4 for PlayStation Portable"
profile = enc-f-mp4
ofps = 30000/1001
-vf-add = scale=480:272,dsize=480:270
+vf-add = scale=w=480:h=272,dsize=w=480:h=270
srate = 48000
channels = 2
ovcopts-add = b=512k,profile=baseline
@@ -176,7 +176,7 @@ ovcopts-add = b=512k,profile=baseline
profile-desc = "MP4 for iPhone"
profile = enc-f-mp4
oautofps = yes # iphone supports 30fps max
-vf-add = scale=-2:320 # half native screen res is probably best here, full res is no fun on tiny display anyway
+vf-add = scale=w=-2:h=320:noup=2 # 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
oacopts-add = b=128k
@@ -184,6 +184,6 @@ oacopts-add = b=128k
profile-desc = "MP4 for iPhone 4 (960x640)"
profile = enc-f-mp4
oautofps = yes # iphone supports 30fps max
-vf-add = scale=-2:640 # native screen res
+vf-add = scale=w=-2:h=640:noup=2 # native screen res
ovcopts-add = maxrate=2500k,bufsize=1000k,rc_init_occupancy=900k,level=30,profile=baseline
oacopts-add = b=128k