X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=export%2Fprofiles.xml;h=c34cef2f8d7dea22f2788a56dbc30e76a2124295;hb=050fec3ed4e78604523c5d799710332f52cda78c;hp=75579fd82f016626d7285cdfe9581d412b5400ae;hpb=dd1c5c0c15c499ff8cd701070dbb3315456421f0;p=kdenlive

diff --git a/export/profiles.xml b/export/profiles.xml
index 75579fd8..c34cef2f 100644
--- a/export/profiles.xml
+++ b/export/profiles.xml
@@ -144,32 +144,32 @@
 </group>
 
 <group name="H.264" renderer="avformat" extension="mp4" type="av">
-  <profile name="H.264 200k" args="f=mp4 hq=1 acodec=libfaac ab=128k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=200k  b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 trellis=1 aspect=%dar" />
-  <profile name="H.264 200k 2 pass" args="f=mp4 hq=1 acodec=libfaac ab=128k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=200k  b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 trellis=1 aspect=%dar pass=2" />
-  <profile name="H.264 400k" args="f=mp4 hq=1 acodec=libfaac ab=128k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=400k  b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 trellis=1 aspect=%dar" />
-  <profile name="H.264 400k 2 pass" args="f=mp4 hq=1 acodec=libfaac ab=128k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=400k  b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 trellis=1 aspect=%dar pass=2" />
-  <profile name="H.264 600k" args="f=mp4 hq=1 acodec=libfaac ab=128k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=600k b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 trellis=1 aspect=%dar" />
-  <profile name="H.264 600k 2 pass" args="f=mp4 hq=1 acodec=libfaac ab=128k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=600k b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 trellis=1 aspect=%dar pass=2" />
-  <profile name="H.264 800k" args="f=mp4 hq=1 acodec=libfaac ab=128k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=800k b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 trellis=1 aspect=%dar" />
-  <profile name="H.264 800k 2 pass" args="f=mp4 hq=1 acodec=libfaac ab=128k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=800k b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 trellis=1 aspect=%dar pass=2" />
-  <profile name="H.264 1000k" args="f=mp4 hq=1 acodec=libfaac ab=128k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=1000k b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 trellis=1 aspect=%dar" />
-  <profile name="H.264 1000k 2 pass" args="f=mp4 hq=1 acodec=libfaac ab=128k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=1000k b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 trellis=1 aspect=%dar pass=2" />
-  <profile name="H.264 2000k" args="f=mp4 hq=1 acodec=libfaac ab=128k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=2000k b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 trellis=1 aspect=%dar" />
-  <profile name="H.264 2000k 2 pass" args="f=mp4 hq=1 acodec=libfaac ab=128k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=2000k b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 trellis=1 aspect=%dar pass=2" />
-  <profile name="H.264 4000k" args="f=mp4 hq=1 acodec=libfaac ab=128k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=4000k b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 trellis=1 aspect=%dar" />
-  <profile name="H.264 4000k 2 pass" args="f=mp4 hq=1 acodec=libfaac ab=128k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=4000k b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 trellis=1 aspect=%dar pass=2" />
-  <profile name="H.264 6000k" args="f=mp4 hq=1 acodec=libfaac ab=128k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=6000k b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 trellis=1 aspect=%dar" />
-  <profile name="H.264 6000k 2 pass" args="f=mp4 hq=1 acodec=libfaac ab=128k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=6000k b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 trellis=1 aspect=%dar pass=2" />
-  <profile name="H.264 8000k" args="f=mp4 hq=1 acodec=libfaac ab=128k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=8000k b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 trellis=1 aspect=%dar" />
-  <profile name="H.264 8000k 2 pass" args="f=mp4 hq=1 acodec=libfaac ab=128k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=8000k b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 trellis=1 aspect=%dar pass=2" />
-  <profile name="H.264 10000k" args="f=mp4 hq=1 acodec=libfaac ab=384k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=10000k b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 trellis=1 aspect=%dar" />
-  <profile name="H.264 10000k 2 pass" args="f=mp4 hq=1 acodec=libfaac ab=384k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=10000k b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 trellis=1 aspect=%dar pass=2" />
-  <profile name="H.264 12000k" args="f=mp4 hq=1 acodec=libfaac ab=384k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=12000k b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 trellis=1 aspect=%dar" />
-  <profile name="H.264 12000k 2 pass" args="f=mp4 hq=1 acodec=libfaac ab=384k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=12000k b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 trellis=1 aspect=%dar pass=2" />
-  <profile name="H.264 18000k" args="f=mp4 hq=1 acodec=libfaac ab=384k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=18000k b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 trellis=1 aspect=%dar" />
-  <profile name="H.264 18000k 2 pass" args="f=mp4 hq=1 acodec=libfaac ab=384k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=18000k b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 trellis=1 aspect=%dar pass=2" />
-  <profile name="H.264 25000k" args="f=mp4 hq=1 acodec=libfaac ab=384k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=25000k b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 trellis=1 aspect=%dar" />
-  <profile name="H.264 25000k 2 pass" args="f=mp4 hq=1 acodec=libfaac ab=384k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=25000k b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 trellis=1 aspect=%dar pass=2" />
+  <profile name="H.264 200k" args="f=mp4 hq=1 acodec=aac ab=128k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=200k  b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 subq=7 qmin=10 qcomp=0.6 qdiff=4 trellis=1 aspect=%dar" />
+  <profile name="H.264 200k 2 pass" args="f=mp4 hq=1 acodec=aac ab=128k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=200k  b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 subq=7 qmin=10 qcomp=0.6 qdiff=4 trellis=1 aspect=%dar pass=2" />
+  <profile name="H.264 400k" args="f=mp4 hq=1 acodec=aac ab=128k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=400k  b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 subq=7 qmin=10 qcomp=0.6 qdiff=4 trellis=1 aspect=%dar" />
+  <profile name="H.264 400k 2 pass" args="f=mp4 hq=1 acodec=aac ab=128k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=400k  b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 subq=7 qmin=10 qcomp=0.6 qdiff=4 trellis=1 aspect=%dar pass=2" />
+  <profile name="H.264 600k" args="f=mp4 hq=1 acodec=aac ab=128k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=600k b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 subq=7 qmin=10 qcomp=0.6 qdiff=4 trellis=1 aspect=%dar" />
+  <profile name="H.264 600k 2 pass" args="f=mp4 hq=1 acodec=aac ab=128k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=600k b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 subq=7 qmin=10 qcomp=0.6 qdiff=4 trellis=1 aspect=%dar pass=2" />
+  <profile name="H.264 800k" args="f=mp4 hq=1 acodec=aac ab=128k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=800k b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 subq=7 qmin=10 qcomp=0.6 qdiff=4 trellis=1 aspect=%dar" />
+  <profile name="H.264 800k 2 pass" args="f=mp4 hq=1 acodec=aac ab=128k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=800k b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 subq=7 qmin=10 qcomp=0.6 qdiff=4 trellis=1 aspect=%dar pass=2" />
+  <profile name="H.264 1000k" args="f=mp4 hq=1 acodec=aac ab=128k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=1000k b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 subq=7 qmin=10 qcomp=0.6 qdiff=4 trellis=1 aspect=%dar" />
+  <profile name="H.264 1000k 2 pass" args="f=mp4 hq=1 acodec=aac ab=128k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=1000k b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 subq=7 qmin=10 qcomp=0.6 qdiff=4 trellis=1 aspect=%dar pass=2" />
+  <profile name="H.264 2000k" args="f=mp4 hq=1 acodec=aac ab=128k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=2000k b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 subq=7 qmin=10 qcomp=0.6 qdiff=4 trellis=1 aspect=%dar" />
+  <profile name="H.264 2000k 2 pass" args="f=mp4 hq=1 acodec=aac ab=128k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=2000k b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 subq=7 qmin=10 qcomp=0.6 qdiff=4 trellis=1 aspect=%dar pass=2" />
+  <profile name="H.264 4000k" args="f=mp4 hq=1 acodec=aac ab=128k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=4000k b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 subq=7 qmin=10 qcomp=0.6 qdiff=4 trellis=1 aspect=%dar" />
+  <profile name="H.264 4000k 2 pass" args="f=mp4 hq=1 acodec=aac ab=128k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=4000k b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 subq=7 qmin=10 qcomp=0.6 qdiff=4 trellis=1 aspect=%dar pass=2" />
+  <profile name="H.264 6000k" args="f=mp4 hq=1 acodec=aac ab=128k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=6000k b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 subq=7 qmin=10 qcomp=0.6 qdiff=4 trellis=1 aspect=%dar" />
+  <profile name="H.264 6000k 2 pass" args="f=mp4 hq=1 acodec=aac ab=128k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=6000k b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 subq=7 qmin=10 qcomp=0.6 qdiff=4 trellis=1 aspect=%dar pass=2" />
+  <profile name="H.264 8000k" args="f=mp4 hq=1 acodec=aac ab=128k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=8000k b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 subq=7 qmin=10 qcomp=0.6 qdiff=4 trellis=1 aspect=%dar" />
+  <profile name="H.264 8000k 2 pass" args="f=mp4 hq=1 acodec=aac ab=128k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=8000k b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 subq=7 qmin=10 qcomp=0.6 qdiff=4 trellis=1 aspect=%dar pass=2" />
+  <profile name="H.264 10000k" args="f=mp4 hq=1 acodec=aac ab=384k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=10000k b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 subq=7 qmin=10 qcomp=0.6 qdiff=4 trellis=1 aspect=%dar" />
+  <profile name="H.264 10000k 2 pass" args="f=mp4 hq=1 acodec=aac ab=384k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=10000k b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 subq=7 qmin=10 qcomp=0.6 qdiff=4 trellis=1 aspect=%dar pass=2" />
+  <profile name="H.264 12000k" args="f=mp4 hq=1 acodec=aac ab=384k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=12000k b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 subq=7 qmin=10 qcomp=0.6 qdiff=4 trellis=1 aspect=%dar" />
+  <profile name="H.264 12000k 2 pass" args="f=mp4 hq=1 acodec=aac ab=384k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=12000k b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 subq=7 qmin=10 qcomp=0.6 qdiff=4 trellis=1 aspect=%dar pass=2" />
+  <profile name="H.264 18000k" args="f=mp4 hq=1 acodec=aac ab=384k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=18000k b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 subq=7 qmin=10 qcomp=0.6 qdiff=4 trellis=1 aspect=%dar" />
+  <profile name="H.264 18000k 2 pass" args="f=mp4 hq=1 acodec=aac ab=384k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=18000k b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 subq=7 qmin=10 qcomp=0.6 qdiff=4 trellis=1 aspect=%dar pass=2" />
+  <profile name="H.264 25000k" args="f=mp4 hq=1 acodec=aac ab=384k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=25000k b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 subq=7 qmin=10 qcomp=0.6 qdiff=4 trellis=1 aspect=%dar" />
+  <profile name="H.264 25000k 2 pass" args="f=mp4 hq=1 acodec=aac ab=384k ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 b=25000k b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 subq=7 qmin=10 qcomp=0.6 qdiff=4 trellis=1 aspect=%dar pass=2" />
 </group>
 
 <group name="Flash" renderer="avformat" extension="flv" type="av">
@@ -230,7 +230,7 @@
   <profile name="RealVideo 720x480 2 pass" standard="NTSC" args="vcodec=rv20 acodec=ac3 minrate=0 b=12000k ab=384k ar=48000 s=720x480 g=8 pass=2" />
 </group>
 
-<group name="Theora" renderer="avformat" extension="ogg" type="av">
+<group name="Theora" renderer="avformat" extension="ogv" type="av">
   <profile name="Theora 200k" args="acodec=vorbis ab=128k ar=44100 vcodec=libtheora minrate=0 b=200k aspect=%dar" />
   <profile name="Theora 200k 2 pass" args="acodec=vorbis ab=128k ar=44100 vcodec=libtheora minrate=0 b=200k aspect=%dar pass=2" />
   <profile name="Theora 400k" args="acodec=vorbis ab=128k ar=44100 vcodec=libtheora minrate=0 b=400k aspect=%dar" />
@@ -239,24 +239,38 @@
   <profile name="Theora 600k 2 pass" args="acodec=vorbis ab=128k ar=44100 vcodec=libtheora minrate=0 b=600k aspect=%dar pass=2" />
   <profile name="Theora 800k" args="acodec=vorbis ab=128k ar=44100 vcodec=libtheora minrate=0 b=800k aspect=%dar" />
   <profile name="Theora 800k 2 pass" args="acodec=vorbis ab=128k ar=44100 vcodec=libtheora minrate=0 b=800k aspect=%dar pass=2" />
-  <profile name="Theora 1000k" args="acodec=vorbis ab=128k ar=44100 vcodec=libtheora minrate=0 b=1000k aspect=%dar" />
-  <profile name="Theora 1000k 2 pass" args="acodec=vorbis ab=128k ar=44100 vcodec=libtheora minrate=0 b=1000k aspect=%dar pass=2" />
-  <profile name="Theora 2000k" args="acodec=vorbis ab=128k ar=44100 vcodec=libtheora minrate=0 b=2000k aspect=%dar" />
-  <profile name="Theora 2000k 2 pass" args="acodec=vorbis ab=128k ar=44100 vcodec=libtheora minrate=0 b=2000k aspect=%dar pass=2" />
-  <profile name="Theora 4000k" args="acodec=vorbis ab=128k ar=44100 vcodec=libtheora minrate=0 b=4000k aspect=%dar" />
-  <profile name="Theora 4000k 2 pass" args="acodec=vorbis ab=128k ar=44100 vcodec=libtheora minrate=0 b=4000k aspect=%dar pass=2" />
-  <profile name="Theora 6000k" args="acodec=vorbis ab=128k ar=44100 vcodec=libtheora minrate=0 b=6000k aspect=%dar" />
-  <profile name="Theora 6000k 2 pass" args="acodec=vorbis ab=128k ar=44100 vcodec=libtheora minrate=0 b=6000k aspect=%dar pass=2" />
-  <profile name="Theora 8000k" args="acodec=vorbis ab=128k ar=44100 vcodec=libtheora minrate=0 b=8000k aspect=%dar" />
-  <profile name="Theora 8000k 2 pass" args="acodec=vorbis ab=128k ar=44100 vcodec=libtheora minrate=0 b=8000k aspect=%dar pass=2" />
-  <profile name="Theora 10000k" args="acodec=vorbis ab=128k ar=44100 vcodec=libtheora minrate=0 b=10000k aspect=%dar" />
-  <profile name="Theora 10000k 2 pass" args="acodec=vorbis ab=128k ar=44100 vcodec=libtheora minrate=0 b=10000k aspect=%dar pass=2" />
-  <profile name="Theora 12000k" args="acodec=vorbis ab=128k ar=44100 vcodec=libtheora minrate=0 b=12000k aspect=%dar" />
-  <profile name="Theora 12000k 2 pass" args="acodec=vorbis ab=128k ar=44100 vcodec=libtheora minrate=0 b=12000k aspect=%dar pass=2" />
-  <profile name="Theora 720x576" standard="PAL" args="acodec=vorbis ab=128k ar=44100 vcodec=libtheora minrate=0 b=12000k s=720x576 aspect=%dar" />
-  <profile name="Theora 720x576 2 pass" standard="PAL" args="acodec=vorbis ab=128k ar=44100 vcodec=libtheora minrate=0 b=12000k s=720x576 aspect=%dar pass=2" />
-  <profile name="Theora 720x480" standard="NTSC" args="acodec=vorbis ab=128k ar=44100 vcodec=libtheora minrate=0 b=12000k s=720x480 aspect=%dar" />
-  <profile name="Theora 720x480 2 pass" standard="NTSC" args="acodec=vorbis ab=128k ar=44100 vcodec=libtheora minrate=0 b=12000k s=720x480 aspect=%dar pass=2" />
+  <profile name="Theora 1000k" args="acodec=vorbis ab=128k aq=30 ar=44100 vcodec=libtheora minrate=0 b=1000k aspect=%dar" />
+  <profile name="Theora 1000k 2 pass" args="acodec=vorbis ab=128k aq=30 ar=44100 vcodec=libtheora minrate=0 b=1000k aspect=%dar pass=2" />
+  <profile name="Theora 2000k" args="acodec=vorbis ab=128k aq=30 ar=44100 vcodec=libtheora minrate=0 b=2000k aspect=%dar" />
+  <profile name="Theora 2000k 2 pass" args="acodec=vorbis ab=128k aq=30 ar=44100 vcodec=libtheora minrate=0 b=2000k aspect=%dar pass=2" />
+  <profile name="Theora 4000k" args="acodec=vorbis ab=128k aq=30 ar=44100 vcodec=libtheora minrate=0 b=4000k aspect=%dar" />
+  <profile name="Theora 4000k 2 pass" args="acodec=vorbis ab=128k aq=30 ar=44100 vcodec=libtheora minrate=0 b=4000k aspect=%dar pass=2" />
+  <profile name="Theora 6000k" args="acodec=vorbis ab=128k aq=30 ar=44100 vcodec=libtheora minrate=0 b=6000k aspect=%dar" />
+  <profile name="Theora 6000k 2 pass" args="acodec=vorbis ab=128k aq=30 ar=44100 vcodec=libtheora minrate=0 b=6000k aspect=%dar pass=2" />
+  <profile name="Theora 8000k" args="acodec=vorbis ab=128k aq=30 ar=44100 vcodec=libtheora minrate=0 b=8000k aspect=%dar" />
+  <profile name="Theora 8000k 2 pass" args="acodec=vorbis ab=128k aq=30 ar=44100 vcodec=libtheora minrate=0 b=8000k aspect=%dar pass=2" />
+  <profile name="Theora 10000k" args="acodec=vorbis ab=128k aq=30 ar=44100 vcodec=libtheora minrate=0 b=10000k aspect=%dar" />
+  <profile name="Theora 10000k 2 pass" args="acodec=vorbis ab=128k aq=30 ar=44100 vcodec=libtheora minrate=0 b=10000k aspect=%dar pass=2" />
+  <profile name="Theora 12000k" args="acodec=vorbis ab=128k aq=30 ar=44100 vcodec=libtheora minrate=0 b=12000k aspect=%dar" />
+  <profile name="Theora 12000k 2 pass" args="acodec=vorbis ab=128k aq=30 ar=44100 vcodec=libtheora minrate=0 b=12000k aspect=%dar pass=2" />
+  <profile name="Theora 720x576" standard="PAL" args="acodec=vorbis ab=384k aq=30 ar=44100 vcodec=libtheora minrate=0 b=12000k s=720x576 aspect=%dar" />
+  <profile name="Theora 720x576 2 pass" standard="PAL" args="acodec=vorbis ab=384k aq=30 ar=44100 vcodec=libtheora minrate=0 b=12000k s=720x576 aspect=%dar pass=2" />
+  <profile name="Theora 720x480" standard="NTSC" args="acodec=vorbis ab=384k aq=30 ar=44100 vcodec=libtheora minrate=0 b=12000k s=720x480 aspect=%dar" />
+  <profile name="Theora 720x480 2 pass" standard="NTSC" args="acodec=vorbis ab=384k aq=30 ar=44100 vcodec=libtheora minrate=0 b=12000k s=720x480 aspect=%dar pass=2" />
+</group>
+
+<group name="WebM" renderer="avformat" extension="webm" type="av">
+  <profile name="WebM 200k" args="acodec=vorbis ab=128k ar=44100 vcodec=libvpx minrate=0 b=200k aspect=%dar maxrate=600k g=120 qmax=42 qmin=10 threads=2" />
+  <profile name="WebM 400k" args="acodec=vorbis ab=128k ar=44100 vcodec=libvpx minrate=0 b=400k aspect=%dar maxrate=1200k g=120 qmax=42 qmin=10 threads=2" />
+  <profile name="WebM 600k" args="acodec=vorbis ab=128k ar=44100 vcodec=libvpx minrate=0 b=600k aspect=%dar maxrate=1800k g=120 qmax=42 qmin=10 threads=2" />
+  <profile name="WebM 800k" args="acodec=vorbis ab=128k ar=44100 vcodec=libvpx minrate=0 b=800k aspect=%dar maxrate=2400k g=120 qmax=42 qmin=10 threads=2" />
+  <profile name="WebM 1000k" args="acodec=vorbis ab=128k ar=44100 vcodec=libvpx minrate=0 b=1000k aspect=%dar maxrate=3000k g=120 qmax=42 qmin=10 threads=2" />
+  <profile name="WebM 2000k" args="acodec=vorbis ab=128k ar=44100 vcodec=libvpx minrate=0 b=2000k aspect=%dar maxrate=4000k g=120 qmax=42 qmin=10 threads=2" />
+  <profile name="WebM 4000k" args="acodec=vorbis ab=128k ar=44100 vcodec=libvpx minrate=0 b=4000k aspect=%dar maxrate=8000k g=120 qmax=42 qmin=10 threads=2" />
+  <profile name="WebM 6000k" args="acodec=vorbis ab=128k ar=44100 vcodec=libvpx minrate=0 b=6000k aspect=%dar maxrate=12000k g=120 qmax=42 qmin=10 threads=2" />
+  <profile name="WebM 8000k" args="acodec=vorbis ab=128k ar=44100 vcodec=libvpx minrate=0 b=8000k aspect=%dar maxrate=16000k g=120 qmax=42 qmin=10 threads=2" />
+  <profile name="WebM 10000k" args="acodec=vorbis ab=128k ar=44100 vcodec=libvpx minrate=0 b=10000k aspect=%dar maxrate=20000k g=120 qmax=42 qmin=10 threads=2" />
+  <profile name="WebM 12000k" args="acodec=vorbis ab=128k ar=44100 vcodec=libvpx minrate=0 b=12000k aspect=%dar maxrate=24000k g=120 qmax=42 qmin=10 threads=2" />
 </group>
 
 <group name="Media players" renderer="avformat" type="av">
@@ -267,30 +281,30 @@
   <profile name="Windows Media Player WMV V7 1000k 2 pass" extension="avi" args="acodec=libmp3lame ab=128k ar=48000 ac=2 vcodec=wmv1 minrate=0 b=1000k aspect=%dar pass=2" />
   <profile name="Windows Media Player WMV V7 2000k" extension="avi" args="acodec=libmp3lame ab=128k ar=48000 ac=2 vcodec=wmv1 minrate=0 b=2000k aspect=%dar" />
   <profile name="Windows Media Player WMV V7 2000k 2 pass" extension="avi" args="acodec=libmp3lame ab=128k ar=48000 ac=2 vcodec=wmv1 minrate=0 b=2000k aspect=%dar pass=2" />
-  <profile name="Apple Quicktime Player MPEG-4 400k" extension="mov" args="acodec=libfaac ab=128k ac=2 ar=48000 vcodec=mpeg4 minrate=0 b=400k aspect=%dar" />
-  <profile name="Apple Quicktime Player MPEG-4 400k 2 pass" extension="mov" args="acodec=libfaac ab=128k ac=2 ar=48000 vcodec=mpeg4 minrate=0 b=400k aspect=%dar pass=2" />
-  <profile name="Apple Quicktime Player MPEG-4 1000k" extension="mov" args="acodec=libfaac ab=128k ac=2 ar=48000 vcodec=mpeg4 minrate=0 b=1000k aspect=%dar" />
-  <profile name="Apple Quicktime Player MPEG-4 1000k 2 pass" extension="mov" args="acodec=libfaac ab=128k ac=2 ar=48000 vcodec=mpeg4 minrate=0 b=1000k aspect=%dar pass=2" />
-  <profile name="Apple Quicktime Player MPEG-4 2000k" extension="mov" args="acodec=libfaac ab=128k ac=2 ar=48000 vcodec=mpeg4 minrate=0 b=2000k aspect=%dar" />
-  <profile name="Apple Quicktime Player MPEG-4 2000k 2 pass" extension="mov" args="acodec=libfaac ab=128k ac=2 ar=48000 vcodec=mpeg4 minrate=0 b=2000k aspect=%dar pass=2" />
+  <profile name="Apple Quicktime Player MPEG-4 400k" extension="mov" args="acodec=aac ab=128k ac=2 ar=48000 vcodec=mpeg4 minrate=0 b=400k aspect=%dar" />
+  <profile name="Apple Quicktime Player MPEG-4 400k 2 pass" extension="mov" args="acodec=aac ab=128k ac=2 ar=48000 vcodec=mpeg4 minrate=0 b=400k aspect=%dar pass=2" />
+  <profile name="Apple Quicktime Player MPEG-4 1000k" extension="mov" args="acodec=aac ab=128k ac=2 ar=48000 vcodec=mpeg4 minrate=0 b=1000k aspect=%dar" />
+  <profile name="Apple Quicktime Player MPEG-4 1000k 2 pass" extension="mov" args="acodec=aac ab=128k ac=2 ar=48000 vcodec=mpeg4 minrate=0 b=1000k aspect=%dar pass=2" />
+  <profile name="Apple Quicktime Player MPEG-4 2000k" extension="mov" args="acodec=aac ab=128k ac=2 ar=48000 vcodec=mpeg4 minrate=0 b=2000k aspect=%dar" />
+  <profile name="Apple Quicktime Player MPEG-4 2000k 2 pass" extension="mov" args="acodec=aac ab=128k ac=2 ar=48000 vcodec=mpeg4 minrate=0 b=2000k aspect=%dar pass=2" />
 </group>
 
 <group name="Web sites" renderer="avformat" type="av">
   <groupname id="websites">Web sites</groupname>
   <profile name="Dailymotion 320x240" extension="flv" args="f=flv acodec=libmp3lame ab=128k ar=44100 vcodec=flv minrate=0 b=800k s=320x240 aspect=%dar trellis=1" url="http://www.dailymotion.com/upload" />
-  <profile name="Dailymotion 320x240 2 pass" extension="flv" args="f=flv acodec=libmp3lame ab=128k ar=44100 vcodec=flv minrate=0 b=800k s=320x240 aspect=%dar trellis=1 pass=2" url="http://www.dailymotion.com/upload" />
-  <profile name="Dailymotion 512x384" extension="mp4" args="f=mp4 acodec=libfaac ab=96k ar=44100 vcodec=libx264 minrate=0 b=600k s=512x384 aspect=%dar mbd=2 trellis=1 mv4=1" url="http://www.dailymotion.com/upload" />
-  <profile name="Dailymotion 512x384 2 pass" extension="mp4" args="f=mp4 acodec=libfaac ab=96k ar=44100 vcodec=libx264 minrate=0 b=600k s=512x384 aspect=%dar mbd=2 trellis=1 mv4=1 pass=2" url="http://www.dailymotion.com/upload" />
-  <profile name="Dailymotion 1280x720" extension="mp4" args="f=mp4 acodec=libfaac ab=96k ar=44100 vcodec=libx264 minrate=0 b=1500k s=1280x720 aspect=%dar mbd=2 trellis=1 mv4=1" url="http://www.dailymotion.com/upload" />
-  <profile name="Dailymotion 1280x720 2 pass" extension="mp4" args="f=mp4 acodec=libfaac ab=96k ar=44100 vcodec=libx264 minrate=0 b=1500k s=1280x720 aspect=%dar mbd=2 trellis=1 mv4=1 pass=2" url="http://www.dailymotion.com/upload" />
-   <profile name="Vimeo 640x480" extension="mp4" args="f=mp4 acodec=libfaac ab=128k ar=44100 vcodec=libx264 minrate=0 b=3000k s=640x480 aspect=%dar mbd=2 trellis=1 mv4=1" url="http://www.vimeo.com/upload" />
-   <profile name="Vimeo 640x480 2 pass" extension="mp4" args="f=mp4 acodec=libfaac ab=128k ar=44100 vcodec=libx264 minrate=0 b=3000k s=640x480 aspect=%dar mbd=2 trellis=1 mv4=1 pass=2" url="http://www.vimeo.com/upload" />
-  <profile name="Vimeo 1280x720" extension="mp4" args="f=mp4 acodec=libfaac ab=128k ar=44100 vcodec=libx264 minrate=0 b=5000k s=1280x720 aspect=%dar mbd=2 trellis=1 mv4=1" url="http://www.vimeo.com/upload" />
-  <profile name="Vimeo 1280x720 2 pass" extension="mp4" args="f=mp4 acodec=libfaac ab=128k ar=44100 vcodec=libx264 minrate=0 b=5000k s=1280x720 aspect=%dar mbd=2 trellis=1 mv4=1 pass=2" url="http://www.vimeo.com/upload" />
-  <profile name="YouTube 640x480" extension="mp4" args="f=mp4 acodec=libmp3lame ab=128k ar=44100 vcodec=mpeg4 minrate=0 b=800k s=640x480 aspect=%dar mbd=2 trellis=1 mv4=1" url="http://www.youtube.com/upload" />
-  <profile name="YouTube 640x480 2 pass" extension="mp4" args="f=mp4 acodec=libmp3lame ab=128k ar=44100 vcodec=mpeg4 minrate=0 b=800k s=640x480 aspect=%dar mbd=2 trellis=1 mv4=1 pass=2" url="http://www.youtube.com/upload" />
-  <profile name="YouTube 1280x720" extension="mp4" args="f=mp4 hq=1 acodec=libfaac ab=128k ar=41100 vcodec=mpeg4 minrate=0 b=2000k s=1280x720 aspect=%dar mbd=2 trellis=1 mv4=1" url="http://www.youtube.com/upload" />
-  <profile name="YouTube 1280x720 2 pass" extension="mp4" args="f=mp4 hq=1 acodec=libfaac ab=128k ar=41100 vcodec=mpeg4 minrate=0 b=2000k s=1280x720 aspect=%dar mbd=2 trellis=1 mv4=1 pass=2" url="http://www.youtube.com/upload" />
+  <profile name="Dailymotion 320x240 2 pass" extension="flv" args="f=flv acodec=libmp3lame ab=128k ar=44100 vcodec=flv minrate=0 b=800k s=320x240 aspect=%dar trellis=1 subq=7 qmin=10 qcomp=0.6 qdiff=4 pass=2" url="http://www.dailymotion.com/upload" />
+  <profile name="Dailymotion 512x384" extension="mp4" args="f=mp4 acodec=aac ab=96k ar=44100 vcodec=libx264 minrate=0 b=600k s=512x384 aspect=%dar mbd=2 trellis=1 mv4=1 subq=7 qmin=10 qcomp=0.6 qdiff=4 qmax=51" url="http://www.dailymotion.com/upload" />
+  <profile name="Dailymotion 512x384 2 pass" extension="mp4" args="f=mp4 acodec=aac ab=96k ar=44100 vcodec=libx264 minrate=0 b=600k s=512x384 aspect=%dar mbd=2 trellis=1 mv4=1 subq=7 qmin=10 qcomp=0.6 qdiff=4 qmax=51 pass=2" url="http://www.dailymotion.com/upload" />
+  <profile name="Dailymotion 1280x720" extension="mp4" args="f=mp4 acodec=aac ab=96k ar=44100 vcodec=libx264 minrate=0 b=1500k s=1280x720 aspect=%dar mbd=2 trellis=1 mv4=1 subq=7 qmin=10 qcomp=0.6 qdiff=4 qmax=51" url="http://www.dailymotion.com/upload" />
+  <profile name="Dailymotion 1280x720 2 pass" extension="mp4" args="f=mp4 acodec=aac ab=96k ar=44100 vcodec=libx264 minrate=0 b=1500k s=1280x720 aspect=%dar mbd=2 trellis=1 mv4=1 subq=7 qmin=10 qcomp=0.6 qdiff=4 qmax=51 pass=2" url="http://www.dailymotion.com/upload" />
+   <profile name="Vimeo 640x480" extension="mp4" args="f=mp4 acodec=aac ab=128k ar=44100 vcodec=libx264 minrate=0 b=3000k s=640x480 aspect=%dar mbd=2 trellis=1 mv4=1 subq=7 qmin=10 qcomp=0.6 qdiff=4 qmax=51" url="http://www.vimeo.com/upload" />
+   <profile name="Vimeo 640x480 2 pass" extension="mp4" args="f=mp4 acodec=aac ab=128k ar=44100 vcodec=libx264 minrate=0 b=3000k s=640x480 aspect=%dar mbd=2 trellis=1 mv4=1 subq=7 qmin=10 qcomp=0.6 qdiff=4 qmax=51 pass=2" url="http://www.vimeo.com/upload" />
+  <profile name="Vimeo 1280x720" extension="mp4" args="f=mp4 acodec=aac ab=128k ar=44100 vcodec=libx264 minrate=0 b=5000k s=1280x720 aspect=%dar mbd=2 trellis=1 mv4=1 subq=7 qmin=10 qcomp=0.6 qdiff=4 qmax=51" url="http://www.vimeo.com/upload" />
+  <profile name="Vimeo 1280x720 2 pass" extension="mp4" args="f=mp4 acodec=aac ab=128k ar=44100 vcodec=libx264 minrate=0 b=5000k s=1280x720 aspect=%dar mbd=2 trellis=1 mv4=1 subq=7 qmin=10 qcomp=0.6 qdiff=4 qmax=51 pass=2" url="http://www.vimeo.com/upload" />
+  <profile name="YouTube 640x480" extension="mp4" args="f=mp4 acodec=libmp3lame ab=128k ar=44100 vcodec=mpeg4 minrate=0 b=800k s=640x480 aspect=%dar mbd=2 trellis=1 mv4=1 subq=7 qmin=10 qcomp=0.6 qdiff=4 qmax=51" url="http://www.youtube.com/upload" />
+  <profile name="YouTube 640x480 2 pass" extension="mp4" args="f=mp4 acodec=libmp3lame ab=128k ar=44100 vcodec=mpeg4 minrate=0 b=800k s=640x480 aspect=%dar mbd=2 trellis=1 mv4=1 subq=7 qmin=10 qcomp=0.6 qdiff=4 qmax=51 pass=2" url="http://www.youtube.com/upload" />
+  <profile name="YouTube 1280x720" extension="mp4" args="f=mp4 hq=1 acodec=aac ab=128k ar=44100 vcodec=mpeg4 minrate=0 b=2000k s=1280x720 aspect=%dar mbd=2 trellis=1 mv4=1 subq=7 qmin=10 qcomp=0.6 qdiff=4 qmax=51" url="http://www.youtube.com/upload" />
+  <profile name="YouTube 1280x720 2 pass" extension="mp4" args="f=mp4 hq=1 acodec=aac ab=128k ar=44100 vcodec=mpeg4 minrate=0 b=2000k s=1280x720 aspect=%dar mbd=2 trellis=1 mv4=1 subq=7 qmin=10 qcomp=0.6 qdiff=4 qmax=51 pass=2" url="http://www.youtube.com/upload" />
 
 </group>
 
@@ -309,8 +323,15 @@
   <profile name="HuffYUV lossless (video) + PCM (sound)" extension="avi" args="f=avi acodec=pcm_s16le ac=2 vcodec=huffyuv aspect=%dar" />
   <profile name="MPEG-2 I-frame only (video) + MP2 (sound)" extension="mpg" args="f=mpeg acodec=mp2 ab=384k ar=48000 ac=2 vcodec=mpeg2video qscale=1 qmin=1 aspect=%dar intra=1" />
   <profile name="MPEG-4 I-frame only (video) + MP3 (sound)" extension="mp4" args="f=mp4 acodec=libmp3lame ab=384k ar=48000 ac=2 vcodec=mpeg4 qscale=1 qmin=1 aspect=%dar intra=1" />
- <profile name="H.264 I-frame only (video) + AAC (sound)" extension="mp4" args="f=mp4 acodec=libfaac ab=384k ar=48000 ac=2 pix_fmt=yuv420p vcodec=libx264 cqp=1 coder=ac trellis=1 aspect=%dar intra=1" />
- <profile name="H.264 lossless fast (video) + AAC (sound)" extension="mp4" args="f=mp4 acodec=libfaac ab=384k ar=48000 ac=2 pix_fmt=yuv420p vcodec=libx264 cqp=0 me_method=esa subq=8 coder=ac partitions=+parti4x4+parti8x8+partp4x4+partp8x8+partb8x8 refs=16 flags2=+dct8x8+mixed_refs trellis=1 aspect=%dar" />
- <profile name="H.264 lossless slow (video) + AAC (sound)" extension="mp4" args="f=mp4 acodec=libfaac ab=384k ar=48000 ac=2 pix_fmt=yuv420p vcodec=libx264 cqp=0 me_method=dia subq=1 partitions=-parti4x4-parti8x8-partp4x4-partp8x8-partb8x8 trellis=1 aspect=%dar" />
+ <profile name="H.264 I-frame only (video) + AAC (sound)" extension="mp4" args="f=mp4 acodec=aac ab=384k ar=48000 ac=2 pix_fmt=yuv420p vcodec=libx264 cqp=1 subq=1 qmax=1 qmin=1 qcomp=0.6 qdiff=0 coder=ac trellis=1 aspect=%dar intra=1" />
+ <profile name="H.264 lossless slow (video) + AAC (sound)" extension="mp4" args="f=mp4 acodec=aac ab=384k ar=48000 ac=2 pix_fmt=yuv420p vcodec=libx264 cqp=0 me_method=esa subq=8 qmin=10 qcomp=0.6 qdiff=4 qmax=51 coder=ac partitions=+parti4x4+parti8x8+partp4x4+partp8x8+partb8x8 refs=16 flags2=+dct8x8+mixed_refs trellis=1 aspect=%dar" />
+ <profile name="H.264 lossless fast (video) + AAC (sound)" extension="mp4" args="f=mp4 acodec=aac ab=384k ar=48000 ac=2 pix_fmt=yuv420p vcodec=libx264 cqp=0 me_method=dia subq=1 qmin=10 qcomp=0.6 qdiff=4 qmax=51 partitions=-parti4x4-parti8x8-partp4x4-partp8x8-partb8x8 trellis=1 aspect=%dar" />
 </group>
+
+<group name="Apple" renderer="avformat" type="av">
+  <groupname id="mobile">Mobile devices</groupname>
+  <profile name="iPhone/iPod" extension="m4v" args="s=480x320 aspect=%dar progressive=1 acodec=aac ar=44100 ab=128k vcodec=libx264 b=700k flags=+loop cmp=+chroma partitions=+parti8x8+parti4x4+partp8x8+partb8x8 me_method=hex subq=7 me_range=16 g=250 keyint_min=25 sc_threshold=40 i_qfactor=0.71 b_strategy=1 qcomp=0.6 qmin=10 qmax=51 qdiff=4 directpred=1 trellis=1 coder=0 bf=0 refs=1 flags2=-wpred-dct8x8 level=30 maxrate=10000k bufsize=10000k wpredp=0" />
+  <profile name="iPhone/iPod 2 pass" extension="m4v" args="s=480x320 aspect=%dar progressive=1 acodec=aac ar=44100 ab=128k vcodec=libx264 b=700k flags=+loop cmp=+chroma partitions=+parti8x8+parti4x4+partp8x8+partb8x8 me_method=hex subq=7 me_range=16 g=250 keyint_min=25 sc_threshold=40 i_qfactor=0.71 b_strategy=1 qcomp=0.6 qmin=10 qmax=51 qdiff=4 directpred=1 trellis=1 coder=0 bf=0 refs=1 flags2=-wpred-dct8x8 level=30 maxrate=10000k bufsize=10000k wpredp=0 pass=2" />
+</group>
+
 </profiles>