--- presets.xml.orig	2012-02-12 21:03:12.000000000 +0100
+++ presets.xml	2013-02-14 14:12:24.024266800 +0100
@@ -2,13 +2,13 @@
 <presets>
   <BlackberryCurvefs>
     <label>Blackberry Curve Fullscreen</label>
-    <params>-f mp4 -vcodec mpeg4 -b 400k -r 24 -vf scale=320:240 -aspect 4:3 -acodec libfaac -ar 22050 -ac 2 -ab 48k</params>
+    <params>-f mp4 -c:v mpeg4 -b:v 400k -r 24 -vf scale=320:240 -aspect 4:3 -c:a aac -strict -2 -ar 22050 -ac 2 -b:a 48k</params>
     <extension>mp4</extension>
     <category>Blackberry</category>
   </BlackberryCurvefs>
   <BlackberryCurvews>
     <label>Blackberry Curve Widescreen</label>
-    <params>-f mp4 -vcodec mpeg4 -b 400k -r 24 -vf scale=320:180 -aspect 16:9 -acodec libfaac -ar 22050 -ac 2 -ab 48k</params>
+    <params>-f mp4 -c:v mpeg4 -b:v 400k -r 24 -vf scale=320:180 -aspect 16:9 -c:a aac -strict -2 -ar 22050 -ac 2 -b:a 48k</params>
     <extension>mp4</extension>
     <category>Blackberry</category>
   </BlackberryCurvews>
@@ -20,337 +20,337 @@
   </CDWavStereo>
   <GigabeatFS>
     <label>RB Toshiba Gigabeat F/X Fullscreen</label>
-    <params>-acodec libmp3lame -ab 128k -ar 44100 -vcodec mpeg2video -vf scale=320:240 -b 600k -strict -1</params>
+    <params>-c:a libmp3lame -b:a 128k -ar 44100 -c:v mpeg2video -vf scale=320:240 -b:v 600k -strict -1</params>
     <extension>mpg</extension>
     <category>Rockbox</category>
   </GigabeatFS>
   <GigabeatWS>
     <label>RB Toshiba Gigabeat F/X Widescreen</label>
-    <params>-acodec libmp3lame -ab 128k -ar 44100 -vcodec mpeg2video -vf scale=320:176 -b 600k -strict -1</params>
+    <params>-c:a libmp3lame -b:a 128k -ar 44100 -c:v mpeg2video -vf scale=320:176 -b:v 600k -strict -1</params>
     <extension>mpg</extension>
     <category>Rockbox</category>
   </GigabeatWS>
   <H1020FS>
     <label>RB iRiver H10 20GB Fullscreen</label>
-    <params>-acodec libmp3lame -ab 128k -ar 44100 -vcodec mpeg2video -vf scale=160:128 -b 224k -strict -1</params>
+    <params>-c:a libmp3lame -b:a 128k -ar 44100 -c:v mpeg2video -vf scale=160:128 -b:v 224k -strict -1</params>
     <extension>mpg</extension>
     <category>Rockbox</category>
   </H1020FS>
   <H1020WS>
     <label>RB iRiver H10 20GB Widescreen</label>
-    <params>-acodec libmp3lame -ab 128k -ar 44100 -vcodec mpeg2video -vf scale=160:96 -b 224k -strict -1</params>
+    <params>-c:a libmp3lame -b:a 128k -ar 44100 -c:v mpeg2video -vf scale=160:96 -b:v 224k -strict -1</params>
     <extension>mpg</extension>
     <category>Rockbox</category>
   </H1020WS>
   <H105FS>
     <label>RB iRiver H10 5/6GB Fullscreen</label>
-    <params>-acodec libmp3lame -ab 128k -ar 44100 -vcodec mpeg2video -vf scale=128:96 -b 224k -strict -1</params>
+    <params>-c:a libmp3lame -b:a 128k -ar 44100 -c:v mpeg2video -vf scale=128:96 -b:v 224k -strict -1</params>
     <extension>mpg</extension>
     <category>Rockbox</category>
   </H105FS>
   <H105WS>
     <label>RB iRiver H10 5/6GB Widescreen</label>
-    <params>-acodec libmp3lame -ab 128k -ar 44100 -vcodec mpeg2video -vf scale=128:80 -b 224k -strict -1</params>
+    <params>-c:a libmp3lame -b:a 128k -ar 44100 -c:v mpeg2video -vf scale=128:80 -b:v 224k -strict -1</params>
     <extension>mpg</extension>
     <category>Rockbox</category>
   </H105WS>
   <H300FS>
     <label>RB iRiver H300 Fullscreen</label>
-    <params>-acodec libmp3lame -ab 96k -ar 44100 -vcodec mpeg2video -vf scale=224:176 -b 224k -r 10 -strict -1</params>
+    <params>-c:a libmp3lame -b:a 96k -ar 44100 -c:v mpeg2video -vf scale=224:176 -b:v 224k -r 10 -strict -1</params>
     <extension>mpg</extension>
     <category>Rockbox</category>
   </H300FS>
   <H300WS>
     <label>RB iRiver H300 Widescreen</label>
-    <params>-acodec libmp3lame -ab 96k -ar 44100 -vcodec mpeg2video -vf scale=224:128 -b 256k -r 15 -strict -1</params>
+    <params>-c:a libmp3lame -b:a 96k -ar 44100 -c:v mpeg2video -vf scale=224:128 -b:v 256k -r 15 -strict -1</params>
     <extension>mpg</extension>
     <category>Rockbox</category>
   </H300WS>
   <I5GFS>
     <label>RB Apple iPod Video Fullscreen</label>
-    <params>-acodec libmp3lame -ab 128k -ar 44100 -vcodec mpeg2video -vf scale=320:240 -b 400k -strict -1</params>
+    <params>-c:a libmp3lame -b:a 128k -ar 44100 -c:v mpeg2video -vf scale=320:240 -b:v 400k -strict -1</params>
     <extension>mpg</extension>
     <category>Rockbox</category>
   </I5GFS>
   <I5GWS>
     <label>RB Apple iPod Video Widescreen</label>
-    <params>-acodec libmp3lame -ab 128k -ar 44100 -vcodec mpeg2video -vf scale=320:176 -b 400k -strict -1</params>
+    <params>-c:a libmp3lame -b:a 128k -ar 44100 -c:v mpeg2video -vf scale=320:176 -b:v 400k -strict -1</params>
     <extension>mpg</extension>
     <category>Rockbox</category>
   </I5GWS>
   <M4a>
     <label>MPEG4 Audio</label>
-    <params>-vn -acodec libfaac -ab 112k -ac 2 -ar 48000</params>
+    <params>-vn -c:a aac -strict -2 -b:a 112k -ac 2 -ar 48000</params>
     <extension>m4a</extension>
     <category>Audio</category>
   </M4a>
   <MP3GP128x96mono43>
     <label>3GPP H.263 128x96 4:3 AAC mono</label>
-    <params>-r 15 -b 64k -ac 1 -vf scale=128:96 -ar 16000 -ab 32k -acodec libfaac -vcodec h263</params>
+    <params>-r 15 -b:v 64k -ac 1 -vf scale=128:96 -ar 16000 -b:a 32k -c:a aac -strict -2 -c:v h263</params>
     <extension>3gp</extension>
     <category>Mobile Phones</category>
   </MP3GP128x96mono43>
   <MP3GP176x144mono169C>
     <label>3GPP H.263 176x144 16:9 crop AAC mono</label>
-    <params>-r 15 -b 64k -ac 1 -vf scale=256:144,crop=iw-2*40 -ar 16000 -ab 32k -acodec libfaac -vcodec h263</params>
+    <params>-r 15 -b:v 64k -ac 1 -vf scale=256:144,crop=iw-2*40 -ar 16000 -b:a 32k -c:a aac -strict -2 -c:v h263</params>
     <extension>3gp</extension>
     <category>Mobile Phones</category>
   </MP3GP176x144mono169C>
   <MP3GP176x144mono169L>
     <label>3GPP H.263 176x144 16:9 letterbox AAC mono</label>
-    <params>-r 15 -b 64k -ac 1 -vf scale=176:100,pad=iw:ih+2*22:0:22 -ar 16000 -ab 32k -acodec libfaac -vcodec h263</params>
+    <params>-r 15 -b:v 64k -ac 1 -vf scale=176:100,pad=iw:ih+2*22:0:22 -ar 16000 -b:a 32k -c:a aac -strict -2 -c:v h263</params>
     <extension>3gp</extension>
     <category>Mobile Phones</category>
   </MP3GP176x144mono169L>
   <MP3GP176x144mono43>
     <label>3GPP H.263 176x144 4:3 AAC mono</label>
-    <params>-r 15 -b 64k -ac 1 -vf scale=176:132,pad=iw:ih+2*6:0:6 -ar 16000 -ab 32k -acodec libfaac -vcodec h263</params>
+    <params>-r 15 -b:v 64k -ac 1 -vf scale=176:132,pad=iw:ih+2*6:0:6 -ar 16000 -b:a 32k -c:a aac -strict -2 -c:v h263</params>
     <extension>3gp</extension>
     <category>Mobile Phones</category>
   </MP3GP176x144mono43>
   <MP3GP320x240stereo169C>
     <label>3GPP H.264 320x240 16:9 crop AAC stereo</label>
-    <params>-r 15 -b 128k -vf scale=426:240,crop=iw-52-54:ih:52 -ar 22050 -ab 64k -acodec libfaac -vcodec libx264 -coder 1 -flags +loop -cmp +chroma -partitions +parti4x4+partp8x8+partb8x8 -me_method hex -subq 6 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 1 -qcomp 0.6 -qmin 0 -qmax 69 -qdiff 4 -bf 3 -refs 3 -directpred 1 -trellis 1 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -threads 0</params>
+    <params>-r 15 -b:v 128k -vf scale=426:240,crop=iw-52-54:ih:52 -ar 22050 -b:a 64k -c:a aac -strict -2 -c:v libx264 -coder 1 -flags +loop -cmp +chroma -partitions +parti4x4+partp8x8+partb8x8 -me_method hex -subq 6 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 1 -qcomp 0.6 -qmin 0 -qmax 69 -qdiff 4 -bf 3 -refs 3 -directpred 1 -trellis 1 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -threads 0</params>
     <extension>3gp</extension>
     <category>Mobile Phones</category>
   </MP3GP320x240stereo169C>
   <MP3GP320x240stereo169L>
     <label>3GPP H.264 320x240 16:9 letterbox AAC stereo</label>
-    <params>-r 15 -b 128k -vf scale=320:180,pad=iw:ih+2*30:0:30 -ar 22050 -ab 64k -acodec libfaac -vcodec libx264 -coder 1 -flags +loop -cmp +chroma -partitions +parti4x4+partp8x8+partb8x8 -me_method hex -subq 6 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 1 -qcomp 0.6 -qmin 0 -qmax 69 -qdiff 4 -bf 3 -refs 3 -directpred 1 -trellis 1 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -threads 0</params>
+    <params>-r 15 -b:v 128k -vf scale=320:180,pad=iw:ih+2*30:0:30 -ar 22050 -b:a 64k -c:a aac -strict -2 -c:v libx264 -coder 1 -flags +loop -cmp +chroma -partitions +parti4x4+partp8x8+partb8x8 -me_method hex -subq 6 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 1 -qcomp 0.6 -qmin 0 -qmax 69 -qdiff 4 -bf 3 -refs 3 -directpred 1 -trellis 1 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -threads 0</params>
     <extension>3gp</extension>
     <category>Mobile Phones</category>
   </MP3GP320x240stereo169L>
   <MP3GP320x240stereo43>
     <label>3GPP H.264 320x240 4:3 AAC stereo</label>
-    <params>-r 15 -b 128k -vf scale=320:240 -ar 22050 -ab 64k -acodec libfaac -vcodec libx264 -coder 1 -flags +loop -cmp +chroma -partitions +parti4x4+partp8x8+partb8x8 -me_method hex -subq 6 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 1 -qcomp 0.6 -qmin 0 -qmax 69 -qdiff 4 -bf 3 -refs 3 -directpred 1 -trellis 1 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -threads 0</params>
+    <params>-r 15 -b:v 128k -vf scale=320:240 -ar 22050 -b:a 64k -c:a aac -strict -2 -c:v libx264 -coder 1 -flags +loop -cmp +chroma -partitions +parti4x4+partp8x8+partb8x8 -me_method hex -subq 6 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 1 -qcomp 0.6 -qmin 0 -qmax 69 -qdiff 4 -bf 3 -refs 3 -directpred 1 -trellis 1 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -threads 0</params>
     <extension>3gp</extension>
     <category>Mobile Phones</category>
   </MP3GP320x240stereo43>
   <MPEG4VideoHQ>
     <label>MPEG-4 H.264 video (high quality)</label>
-    <params>-crf 35.0 -vcodec libx264 -acodec libfaac -ar 48000 -ab 128k -coder 1 -flags +loop -cmp +chroma -partitions +parti4x4+partp8x8+partb8x8 -me_method hex -subq 6 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 1 -qcomp 0.6 -qmin 0 -qmax 69 -qdiff 4 -bf 3 -refs 5 -directpred 3 -trellis 1 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -rc_lookahead 50 -threads 0</params>
+    <params>-crf 35.0 -c:v libx264 -c:a aac -strict -2 -ar 48000 -b:a 128k -coder 1 -flags +loop -cmp +chroma -partitions +parti4x4+partp8x8+partb8x8 -me_method hex -subq 6 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 1 -qcomp 0.6 -qmin 0 -qmax 69 -qdiff 4 -bf 3 -refs 5 -directpred 3 -trellis 1 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -rc_lookahead 50 -threads 0</params>
     <extension>mp4</extension>
     <category>MPEG-4</category>
   </MPEG4VideoHQ>
   <MPEG4VideoSHQ>
     <label>MPEG-4 H.264 video (super high quality)</label>
-    <params>-crf 15.0 -vcodec libx264 -acodec libfaac -ar 48000 -ab 192k -coder 1 -flags +loop -cmp +chroma -partitions +parti4x4+partp8x8+partb8x8 -me_method hex -subq 6 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 1 -qcomp 0.6 -qmin 0 -qmax 69 -qdiff 4 -bf 8 -refs 16 -directpred 3 -trellis 2 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -rc_lookahead 60 -threads 0</params>
+    <params>-crf 15.0 -c:v libx264 -c:a aac -strict -2 -ar 48000 -b:a 192k -coder 1 -flags +loop -cmp +chroma -partitions +parti4x4+partp8x8+partb8x8 -me_method hex -subq 6 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 1 -qcomp 0.6 -qmin 0 -qmax 69 -qdiff 4 -bf 8 -refs 16 -directpred 3 -trellis 2 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -rc_lookahead 60 -threads 0</params>
     <extension>mp4</extension>
     <category>MPEG-4</category>
   </MPEG4VideoSHQ>
   <MPEG4VideoVHQ>
     <label>MPEG-4 H.264 video (very high quality)</label>
-    <params>-crf 25.0 -vcodec libx264 -acodec libfaac -ar 48000 -ab 160k -coder 1 -flags +loop -cmp +chroma -partitions +parti4x4+partp8x8+partb8x8 -me_method hex -subq 6 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 1 -qcomp 0.6 -qmin 0 -qmax 69 -qdiff 4 -bf 3 -refs 8 -directpred 3 -trellis 2 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -rc_lookahead 60 -threads 0</params>
+    <params>-crf 25.0 -c:v libx264 -c:a aac -strict -2 -ar 48000 -b:a 160k -coder 1 -flags +loop -cmp +chroma -partitions +parti4x4+partp8x8+partb8x8 -me_method hex -subq 6 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 1 -qcomp 0.6 -qmin 0 -qmax 69 -qdiff 4 -bf 3 -refs 8 -directpred 3 -trellis 2 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -rc_lookahead 60 -threads 0</params>
     <extension>mp4</extension>
     <category>MPEG-4</category>
   </MPEG4VideoVHQ>
   <N810FS>
     <label>Nokia N810 mplayer 4:3</label>
-    <params>-r 29.97 -vcodec libxvid -vtag XVID -vf scale=400:240 -aspect 4:3 -maxrate 1200k -b 1200k -qmin 3 -qmax 5 -bufsize 4096 -mbd 2 -bf 2 -cmp 2 -subcmp 2 -g 300 -acodec libmp3lame -ar 44100 -ab 160k -ac 2 -async 1</params>
+    <params>-r 29.97 -c:v libxvid -vtag XVID -vf scale=400:240 -aspect 4:3 -maxrate 1200k -b:v 1200k -qmin 3 -qmax 5 -bufsize 4096 -mbd 2 -bf 2 -cmp 2 -subcmp 2 -g 300 -c:a libmp3lame -ar 44100 -b:a 160k -ac 2 -async 1</params>
     <extension>avi</extension>
     <category>Nokia</category>
   </N810FS>
   <N810WS>
     <label>Nokia N810 mplayer 16:9</label>
-    <params>-r 29.97 -vcodec libxvid -vtag XVID -vf scale=400:240 -aspect 16:9 -maxrate 1200k -b 1200k -qmin 3 -qmax 5 -bufsize 4096 -mbd 2 -bf 2 -trellis 1 -flags +aic -cmp 2 -subcmp 2 -g 300 -acodec libmp3lame -ar 44100 -ab 160k -ac 2 -async 1</params>
+    <params>-r 29.97 -c:v libxvid -vtag XVID -vf scale=400:240 -aspect 16:9 -maxrate 1200k -b:v 1200k -qmin 3 -qmax 5 -bufsize 4096 -mbd 2 -bf 2 -trellis 1 -flags +aic -cmp 2 -subcmp 2 -g 300 -c:a libmp3lame -ar 44100 -b:a 160k -ac 2 -async 1</params>
     <extension>avi</extension>
     <category>Nokia</category>
   </N810WS>
   <N810WS2>
     <label>Nokia N810 mplayer CinemaScope 24:10</label>
-    <params>-r 29.97 -vcodec libxvid -vtag XVID -vf scale=400:240 -aspect 24:10 -maxrate 1200k -b 1200k -qmin 3 -qmax 5 -bufsize 4096 -mbd 2 -bf 2 -trellis 1 -flags +aic -cmp 2 -subcmp 2 -g 300 -acodec libmp3lame -ar 44100 -ab 160k -ac 2 -async 1</params>
+    <params>-r 29.97 -c:v libxvid -vtag XVID -vf scale=400:240 -aspect 24:10 -maxrate 1200k -b:v 1200k -qmin 3 -qmax 5 -bufsize 4096 -mbd 2 -bf 2 -trellis 1 -flags +aic -cmp 2 -subcmp 2 -g 300 -c:a libmp3lame -ar 44100 -b:a 160k -ac 2 -async 1</params>
     <extension>avi</extension>
     <category>Nokia</category>
   </N810WS2>
   <NeurosOSDTVHQNTSC>
     <label>Neuros HQ NTSC Fullscreen</label>
-    <params>-f mp4 -r 29.97 -vcodec libxvid -vf scale=640:480 -aspect 4:3 -maxrate 2500k -b 2000k -qmin 3 -qmax 5 -bufsize 4096 -mbd 2 -trellis 1 -flags +aic -cmp 2 -subcmp 2 -g 300 -acodec libfaac -ar 48000 -ab 128k -ac 2</params>
+    <params>-f mp4 -r 29.97 -c:v libxvid -vf scale=640:480 -aspect 4:3 -maxrate 2500k -b:v 2000k -qmin 3 -qmax 5 -bufsize 4096 -mbd 2 -trellis 1 -flags +aic -cmp 2 -subcmp 2 -g 300 -c:a aac -strict -2 -ar 48000 -b:a 128k -ac 2</params>
     <extension>mp4</extension>
     <category>Neuros OSD</category>
   </NeurosOSDTVHQNTSC>
   <NeurosOSDTVHQPAL>
     <label>Neuros HQ PAL Fullscreen</label>
-    <params>-f mp4 -r 25 -vcodec libxvid -vf scale=640:480 -aspect 4:3 -maxrate 2500k -b 2000k -qmin 3 -qmax 5 -bufsize 4096 -mbd 2 -trellis 1 -flags +aic -cmp 2 -subcmp 2 -g 300 -acodec libfaac -ar 48000 -ab 128k -ac 2</params>
+    <params>-f mp4 -r 25 -c:v libxvid -vf scale=640:480 -aspect 4:3 -maxrate 2500k -b:v 2000k -qmin 3 -qmax 5 -bufsize 4096 -mbd 2 -trellis 1 -flags +aic -cmp 2 -subcmp 2 -g 300 -c:a aac -strict -2 -ar 48000 -b:a 128k -ac 2</params>
     <extension>mp4</extension>
     <category>Neuros OSD</category>
   </NeurosOSDTVHQPAL>
   <NeurosOSDTVSFNTSC>
     <label>Neuros Small File NTSC Fullscreen</label>
-    <params>-f mp4 -b 800k -r 29.97 -vf scale=320:240 -aspect 4:3 -vcodec libxvid -ar 48000 -ab 80k -ac 2 -acodec libfaac</params>
+    <params>-f mp4 -b:v 800k -r 29.97 -vf scale=320:240 -aspect 4:3 -c:v libxvid -ar 48000 -b:a 80k -ac 2 -c:a aac -strict -2</params>
     <extension>mp4</extension>
     <category>Neuros OSD</category>
   </NeurosOSDTVSFNTSC>
   <NeurosOSDTVSFPAL>
     <label>Neuros Small File PAL Fullscreen</label>
-    <params>-f mp4 -b 800k -r 25 -vf scale=320:240 -aspect 4:3 -vcodec libxvid -ar 48000 -ab 80k -ac 2 -acodec libfaac</params>
+    <params>-f mp4 -b:v 800k -r 25 -vf scale=320:240 -aspect 4:3 -c:v libxvid -ar 48000 -b:a 80k -ac 2 -c:a aac -strict -2</params>
     <extension>mp4</extension>
     <category>Neuros OSD</category>
   </NeurosOSDTVSFPAL>
   <NeurosOSDTVWSHQNTSC>
     <label>Neuros HQ NTSC Widescreen</label>
-    <params>-f mp4 -r 29.97 -vcodec libxvid -vf scale=704:384 -aspect 16:9 -maxrate 3000k -b 2500k -qmin 3 -qmax 5 -bufsize 4096 -mbd 2 -bf 2 -trellis 1 -flags +aic -cmp 2 -subcmp 2 -g 300 -acodec libfaac -ar 48000 -ab 128k -ac 2</params>
+    <params>-f mp4 -r 29.97 -c:v libxvid -vf scale=704:384 -aspect 16:9 -maxrate 3000k -b:v 2500k -qmin 3 -qmax 5 -bufsize 4096 -mbd 2 -bf 2 -trellis 1 -flags +aic -cmp 2 -subcmp 2 -g 300 -c:a aac -strict -2 -ar 48000 -b:a 128k -ac 2</params>
     <extension>mp4</extension>
     <category>Neuros OSD</category>
   </NeurosOSDTVWSHQNTSC>
   <NeurosOSDTVWSHQPAL>
     <label>Neuros HQ PAL Widescreen</label>
-    <params>-f mp4 -r 25 -vcodec libxvid -vf scale=704:384 -aspect 16:9 -maxrate 3000k -b 2500k -qmin 3 -qmax 5 -bufsize 4096 -mbd 2 -bf 2 -trellis 1 -flags +aic -cmp 2 -subcmp 2 -g 300 -acodec libfaac -ar 48000 -ab 128k -ac 2</params>
+    <params>-f mp4 -r 25 -c:v libxvid -vf scale=704:384 -aspect 16:9 -maxrate 3000k -b:v 2500k -qmin 3 -qmax 5 -bufsize 4096 -mbd 2 -bf 2 -trellis 1 -flags +aic -cmp 2 -subcmp 2 -g 300 -c:a aac -strict -2 -ar 48000 -b:a 128k -ac 2</params>
     <extension>mp4</extension>
     <category>Neuros OSD</category>
   </NeurosOSDTVWSHQPAL>
   <NeurosOSDTVWSSFNTSC>
     <label>Neuros Small File NTSC Widescreen</label>
-    <params>-f mp4 -b 800k -r 29.97 -vf scale=352:240 -aspect 16:9 -vcodec libxvid -ar 48000 -ab 80k -ac 2 -acodec libfaac</params>
+    <params>-f mp4 -b:v 800k -r 29.97 -vf scale=352:240 -aspect 16:9 -c:v libxvid -ar 48000 -b:a 80k -ac 2 -c:a aac -strict -2</params>
     <extension>mp4</extension>
     <category>Neuros OSD</category>
   </NeurosOSDTVWSSFNTSC>
   <NeurosOSDTVWSSFPAL>
     <label>Neuros Small File PAL Widescreen</label>
-    <params>-f mp4 -b 800k -r 25 -vf scale=352:240 -aspect 16:9 -vcodec libxvid -ar 48000 -ab 80k -ac 2 -acodec libfaac</params>
+    <params>-f mp4 -b:v 800k -r 25 -vf scale=352:240 -aspect 16:9 -c:v libxvid -ar 48000 -b:a 80k -ac 2 -c:a aac -strict -2</params>
     <extension>mp4</extension>
     <category>Neuros OSD</category>
   </NeurosOSDTVWSSFPAL>
   <NokiaN73N81N95FS>
     <label>Nokia Nxx Video FullScreen</label>
-    <params>-f mp4 -r 15 -vcodec mpeg4 -vf scale=320:240 -b 320k -aspect 4:3 -acodec libfaac -ab 96k -ar 44100 -ac 2</params>
+    <params>-f mp4 -r 15 -c:v mpeg4 -vf scale=320:240 -b:v 320k -aspect 4:3 -c:a aac -strict -2 -b:a 96k -ar 44100 -ac 2</params>
     <extension>mp4</extension>
     <category>Nokia</category>
   </NokiaN73N81N95FS>
   <NokiaN73N81N95WS>
     <label>Nokia Nxx Video WideScreen</label>
-    <params>-f mp4 -r 15 -vcodec mpeg4 -vf scale=320:240 -b 320k -aspect 16:9 -acodec libfaac -ab 96k -ar 44100 -ac 2</params>
+    <params>-f mp4 -r 15 -c:v mpeg4 -vf scale=320:240 -b:v 320k -aspect 16:9 -c:a aac -strict -2 -b:a 96k -ar 44100 -ac 2</params>
     <extension>mp4</extension>
     <category>Nokia</category>
   </NokiaN73N81N95WS>
   <PalmXviDFS>
     <label>Palm Fullscreen</label>
-    <params>-f mp4 -r 29.97 -vcodec libxvid -vf scale=428:320 -aspect 4:3 -maxrate 550k -b 500k -qmin 3 -qmax 5 -bufsize 4096 -mbd 2 -trellis 1 -flags +aic -cmp 2 -subcmp 2 -g 300 -acodec libfaac -ar 44100 -ab 80k -ac 2</params>
+    <params>-f mp4 -r 29.97 -c:v libxvid -vf scale=428:320 -aspect 4:3 -maxrate 550k -b:v 500k -qmin 3 -qmax 5 -bufsize 4096 -mbd 2 -trellis 1 -flags +aic -cmp 2 -subcmp 2 -g 300 -c:a aac -strict -2 -ar 44100 -b:a 80k -ac 2</params>
     <extension>mp4</extension>
     <category>Palm</category>
   </PalmXviDFS>
   <PalmXviDWS>
     <label>Palm Widescreen</label>
-    <params>-f mp4 -r 29.97 -vcodec libxvid -vf scale=480:320 -aspect 3:2 -maxrate 450k -b 430k -qmin 3 -qmax 5 -bufsize 4096 -mbd 2 -trellis 1 -flags +aic -cmp 2 -subcmp 2 -g 300 -acodec libfaac -ar 44100 -ab 80k -ac 2</params>
+    <params>-f mp4 -r 29.97 -c:v libxvid -vf scale=480:320 -aspect 3:2 -maxrate 450k -b:v 430k -qmin 3 -qmax 5 -bufsize 4096 -mbd 2 -trellis 1 -flags +aic -cmp 2 -subcmp 2 -g 300 -c:a aac -strict -2 -ar 44100 -b:a 80k -ac 2</params>
     <extension>mp4</extension>
     <category>Palm</category>
   </PalmXviDWS>
   <PhotoFS>
     <label>RB Apple iPod Photo/Color Fullscreen</label>
-    <params>-acodec libmp3lame -ab 128k -ar 44100 -vcodec mpeg2video -vf scale=224:176 -b 320k -r 15 -strict -1</params>
+    <params>-c:a libmp3lame -b:a 128k -ar 44100 -c:v mpeg2video -vf scale=224:176 -b:v 320k -r 15 -strict -1</params>
     <extension>mpg</extension>
     <category>Rockbox</category>
   </PhotoFS>
   <PhotoWS>
     <label>RB Apple iPod Photo/Color Widescreen</label>
-    <params>-acodec libmp3lame -ab 128k -ar 44100 -vcodec mpeg2video -vf scale=224:128 -b 320k -r 24 -strict -1</params>
+    <params>-c:a libmp3lame -b:a 128k -ar 44100 -c:v mpeg2video -vf scale=224:128 -b:v 320k -r 24 -strict -1</params>
     <extension>mpg</extension>
     <category>Rockbox</category>
   </PhotoWS>
   <X5FS>
     <label>RB Cowon iAudio X5 Fullscreen</label>
-    <params>-acodec libmp3lame -ab 128k -ar 44100 -vcodec mpeg2video -vf scale=160:128 -b 176k -r 15 -strict -1</params>
+    <params>-c:a libmp3lame -b:a 128k -ar 44100 -c:v mpeg2video -vf scale=160:128 -b:v 176k -r 15 -strict -1</params>
     <extension>mpg</extension>
     <category>Rockbox</category>
   </X5FS>
   <X5WS>
     <label>RB Cowon iAudio X5 Widescreen</label>
-    <params>-acodec libmp3lame -ab 128k -ar 44100 -vcodec mpeg2video -vf scale=160:96 -b 224k -r 24 -strict -1</params>
+    <params>-c:a libmp3lame -b:a 128k -ar 44100 -c:v mpeg2video -vf scale=160:96 -b:v 224k -r 24 -strict -1</params>
     <extension>mpg</extension>
     <category>Rockbox</category>
   </X5WS>
   <XviDAVIFS>
     <label>XviD FullScreen</label>
-    <params>-f avi -r 29.97 -vcodec libxvid -vtag XVID -vf scale=640:480 -aspect 4:3 -maxrate 1800k -b 1500k -qmin 3 -qmax 5 -bufsize 4096 -mbd 2 -bf 2 -trellis 1 -flags +aic -cmp 2 -subcmp 2 -g 300 -acodec libmp3lame -ar 48000 -ab 128k -ac 2</params>
+    <params>-f avi -r 29.97 -c:v libxvid -vtag XVID -vf scale=640:480 -aspect 4:3 -maxrate 1800k -b:v 1500k -qmin 3 -qmax 5 -bufsize 4096 -mbd 2 -bf 2 -trellis 1 -flags +aic -cmp 2 -subcmp 2 -g 300 -c:a libmp3lame -ar 48000 -b:a 128k -ac 2</params>
     <extension>avi</extension>
     <category>AVI</category>
   </XviDAVIFS>
   <XviDAVIWS>
     <label>XviD Widescreen</label>
-    <params>-f avi -r 29.97 -vcodec libxvid -vtag XVID -vf scale=704:384 -aspect 16:9 -maxrate 1800k -b 1500k -qmin 3 -qmax 5 -bufsize 4096 -mbd 2 -bf 2 -trellis 1 -flags +aic -cmp 2 -subcmp 2 -g 300 -acodec libmp3lame -ar 48000 -ab 128k -ac 2</params>
+    <params>-f avi -r 29.97 -c:v libxvid -vtag XVID -vf scale=704:384 -aspect 16:9 -maxrate 1800k -b:v 1500k -qmin 3 -qmax 5 -bufsize 4096 -mbd 2 -bf 2 -trellis 1 -flags +aic -cmp 2 -subcmp 2 -g 300 -c:a libmp3lame -ar 48000 -b:a 128k -ac 2</params>
     <extension>avi</extension>
     <category>AVI</category>
   </XviDAVIWS>
   <XviDAVIWSAna>
     <label>XviD Widescreen Anamorphic</label>
-    <params>-f avi -r 29.97 -vf crop=iw:ih-58-62:0:58,scale=640:272 -vcodec libxvid -vtag XVID -aspect 2.35 -maxrate 1800k -b 1500k -qmin 3 -qmax 5 -bufsize 4096 -mbd 2 -bf 2 -trellis 1 -flags +aic -cmp 2 -subcmp 2 -g 300 -acodec libmp3lame -ar 48000 -ab 128k -ac 2</params>
+    <params>-f avi -r 29.97 -vf crop=iw:ih-58-62:0:58,scale=640:272 -c:v libxvid -vtag XVID -aspect 2.35 -maxrate 1800k -b:v 1500k -qmin 3 -qmax 5 -bufsize 4096 -mbd 2 -bf 2 -trellis 1 -flags +aic -cmp 2 -subcmp 2 -g 300 -c:a libmp3lame -ar 48000 -b:a 128k -ac 2</params>
     <extension>avi</extension>
     <category>AVI</category>
   </XviDAVIWSAna>
   <XviDAVIZENFS>
     <label>Zen Fullscreen</label>
-    <params>-f avi -r 29.97 -vcodec libxvid -vtag XVID -vf scale=320:240 -aspect 4:3 -maxrate 1800k -b 1500k -acodec libmp3lame -ar 48000 -ab 128k -ac 2</params>
+    <params>-f avi -r 29.97 -c:v libxvid -vtag XVID -vf scale=320:240 -aspect 4:3 -maxrate 1800k -b:v 1500k -c:a libmp3lame -ar 48000 -b:a 128k -ac 2</params>
     <extension>avi</extension>
     <category>Creative Zen</category>
   </XviDAVIZENFS>
   <XviDAVIZENWS>
     <label>Zen Widescreen</label>
-    <params>-f avi -r 29.97 -vcodec libxvid -vtag XVID -vf scale=320:240 -aspect 16:9 -maxrate 1800k -b 1500k -acodec libmp3lame -ar 48000 -ab 128k -ac 2</params>
+    <params>-f avi -r 29.97 -c:v libxvid -vtag XVID -vf scale=320:240 -aspect 16:9 -maxrate 1800k -b:v 1500k -c:a libmp3lame -ar 48000 -b:a 128k -ac 2</params>
     <extension>avi</extension>
     <category>Creative Zen</category>
   </XviDAVIZENWS>
   <ac3dvd192>
     <label>Ac3 DVD - 192kbps Stereo</label>
-    <params>-f ac3 -acodec ac3 -ab 192k -ar 48000 -ac 2</params>
+    <params>-f ac3 -c:a ac3 -b:a 192k -ar 48000 -ac 2</params>
     <extension>ac3</extension>
     <category>Audio</category>
   </ac3dvd192>
   <ac3dvd384>
     <label>Ac3 DVD - 384kbps Stereo</label>
-    <params>-f ac3 -acodec ac3 -ab 384k -ar 48000 -ac 2</params>
+    <params>-f ac3 -c:a ac3 -b:a 384k -ar 48000 -ac 2</params>
     <extension>ac3</extension>
     <category>Audio</category>
   </ac3dvd384>
   <android1>
     <label>Google Android compatible video</label>
-    <params>-vf scale=480:320 -vcodec mpeg4 -acodec libfaac -ac 1 -ar 16000 -r 13 -ab 32000 -aspect 3:2</params>
+    <params>-vf scale=480:320 -c:v mpeg4 -c:a aac -strict -2 -ac 1 -ar 16000 -r 13 -b:a 32000 -aspect 3:2</params>
     <extension>mp4</extension>
     <category>Google Android</category>
   </android1>
   <android2>
     <label>Google Android compatible video. Video bitrate: 480 kb/s</label>
-    <params>-vf scale=480:320 -vcodec mpeg4 -b 480k -acodec libfaac -ac 1 -ar 16000 -r 13 -ab 32000 -aspect 3:2</params>
+    <params>-vf scale=480:320 -c:v mpeg4 -b:v 480k -c:a aac -strict -2 -ac 1 -ar 16000 -r 13 -b:a 32000 -aspect 3:2</params>
     <extension>mp4</extension>
     <category>Google Android</category>
   </android2>
   <android3>
     <label>Google Android video. VHQ 16:9 widescreen</label>
-    <params>-vf scale=480:272 -vcodec libx264 -coder 1 -flags +loop+cgop -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 0 -qmax 69 -qdiff 4 -bf 3 -refs 3 -directpred 1 -trellis 1 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -b 500k -threads 0 -acodec libfaac -ab 96k</params>
+    <params>-vf scale=480:272 -c:v libx264 -coder 1 -flags +loop+cgop -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 0 -qmax 69 -qdiff 4 -bf 3 -refs 3 -directpred 1 -trellis 1 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -b:v 500k -threads 0 -c:a aac -strict -2 -b:a 96k</params>
     <extension>mp4</extension>
     <category>Google Android</category>
   </android3>
   <android4>
     <label>Google Android video. VHQ 4:3 fullscreen</label>
-    <params>-vf scale=432:320 -vcodec libx264 -coder 1 -flags +loop+cgop -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 0 -qmax 69 -qdiff 4 -bf 3 -refs 3 -directpred 1 -trellis 1 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -b 500k -threads 0 -acodec libfaac -ab 96k</params>
+    <params>-vf scale=432:320 -c:v libx264 -coder 1 -flags +loop+cgop -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 0 -qmax 69 -qdiff 4 -bf 3 -refs 3 -directpred 1 -trellis 1 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -b:v 500k -threads 0 -c:a aac -strict -2 -b:a 96k</params>
     <extension>mp4</extension>
     <category>Google Android</category>
   </android4>
   <blackberryfs>
     <label>Blackberry Video Fullscreen</label>
-    <params>-f mp4 -r 24 -vcodec libx264 -coder 1 -flags +loop+cgop -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 0 -qmax 69 -qdiff 4 -bf 3 -refs 3 -directpred 1 -trellis 1 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -vf scale=240:180 -aspect 4:3 -maxrate 800k -bufsize 80k -b 400k -acodec libfaac -ar 44100 -ab 80k -ac 2</params>
+    <params>-f mp4 -r 24 -c:v libx264 -coder 1 -flags +loop+cgop -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 0 -qmax 69 -qdiff 4 -bf 3 -refs 3 -directpred 1 -trellis 1 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -vf scale=240:180 -aspect 4:3 -maxrate 800k -bufsize 80k -b:v 400k -c:a aac -strict -2 -ar 44100 -b:a 80k -ac 2</params>
     <extension>mp4</extension>
     <category>Blackberry</category>
   </blackberryfs>
   <blackberrymp3>
     <label>Blackberry Music</label>
-    <params>-acodec libmp3lame -ab 160k -ac 2 -ar 44100</params>
+    <params>-c:a libmp3lame -b:a 160k -ac 2 -ar 44100</params>
     <extension>mp3</extension>
     <category>Blackberry</category>
   </blackberrymp3>
   <blackberryws>
     <label>Blackberry Video Widescreen</label>
-    <params>-f mp4 -r 24 -vcodec libx264 -coder 1 -flags +loop+cgop -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 0 -qmax 69 -qdiff 4 -bf 3 -refs 3 -directpred 1 -trellis 1 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -vf scale=320:180 -aspect 16:9 -maxrate 800k -bufsize 80k -b 400k -acodec libfaac -ar 44100 -ab 80k -ac 2</params>
+    <params>-f mp4 -r 24 -c:v libx264 -coder 1 -flags +loop+cgop -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 0 -qmax 69 -qdiff 4 -bf 3 -refs 3 -directpred 1 -trellis 1 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -vf scale=320:180 -aspect 16:9 -maxrate 800k -bufsize 80k -b:v 400k -c:a aac -strict -2 -ar 44100 -b:a 80k -ac 2</params>
     <extension>mp4</extension>
     <category>Blackberry</category>
   </blackberryws>
   <cdma3g>
     <label>CDMA Phone Audio (3g2)</label>
-    <params>-f 3g2 -ar 22050 -ab 128k -acodec libfaac -vf scale=176:144 -r 14.985 -vn</params>
+    <params>-f 3g2 -ar 22050 -b:a 128k -c:a aac -strict -2 -vf scale=176:144 -r 14.985 -vn</params>
     <extension>3g2</extension>
     <category>Mobile Phones</category>
   </cdma3g>
   <divx>
     <label>MS Compatible AVI</label>
-    <params>-acodec libmp3lame -vcodec msmpeg4 -ab 192k -b 1000k -vf scale=640:480 -ar 44100</params>
+    <params>-c:a libmp3lame -c:v msmpeg4 -b:a 192k -b:v 1000k -vf scale=640:480 -ar 44100</params>
     <extension>avi</extension>
     <category>AVI</category>
   </divx>
@@ -368,157 +368,157 @@
   </dvpal>
   <e200FS>
     <label>RB Sandisk Sansa e200 Fullscreen</label>
-    <params>-acodec libmp3lame -ab 128k -ar 44100 -vcodec mpeg2video -vf scale=224:176 -b 320k -strict -1</params>
+    <params>-c:a libmp3lame -b:a 128k -ar 44100 -c:v mpeg2video -vf scale=224:176 -b:v 320k -strict -1</params>
     <extension>mpg</extension>
     <category>Rockbox</category>
   </e200FS>
   <e200WS>
     <label>RB Sandisk Sansa e200 Widescreen</label>
-    <params>-acodec libmp3lame -ab 128k -ar 44100 -vcodec mpeg2video -vf scale=224:128 -b 320k -strict -1</params>
+    <params>-c:a libmp3lame -b:a 128k -ar 44100 -c:v mpeg2video -vf scale=224:128 -b:v 320k -strict -1</params>
     <extension>mpg</extension>
     <category>Rockbox</category>
   </e200WS>
   <flvwebFS>
     <label>Flash Video (flv) for Web use Fullscreen</label>
-    <params>-vcodec flv -f flv -r 29.97 -vf scale=320:240 -aspect 4:3 -b 300k -g 160 -cmp dct  -subcmp dct  -mbd 2 -flags +aic+cbp+mv0+mv4 -trellis 1 -ac 1 -ar 22050 -ab 56k</params>
+    <params>-c:v flv -f flv -r 29.97 -vf scale=320:240 -aspect 4:3 -b:v 300k -g 160 -cmp dct  -subcmp dct  -mbd 2 -flags +aic+cbp+mv0+mv4 -trellis 1 -ac 1 -ar 22050 -b:a 56k</params>
     <extension>flv</extension>
     <category>Websites</category>
   </flvwebFS>
   <flvwebWS>
     <label>Flash: Video (flv) for Web use Widescreen</label>
-    <params>-vcodec flv -f flv -r 29.97 -vf scale=320:180 -aspect 16:9 -b 300k -g 160 -cmp dct -subcmp dct -mbd 2 -flags +aic+cbp+mv0+mv4 -trellis 1 -ac 1 -ar 22050 -ab 56k</params>
+    <params>-c:v flv -f flv -r 29.97 -vf scale=320:180 -aspect 16:9 -b:v 300k -g 160 -cmp dct -subcmp dct -mbd 2 -flags +aic+cbp+mv0+mv4 -trellis 1 -ac 1 -ar 22050 -b:a 56k</params>
     <extension>flv</extension>
     <category>Websites</category>
   </flvwebWS>
   <googleandroidwebm>
     <label>Google WebM for Andriod 2.3.3+</label>
-    <params>-f webm -aspect 3:2 -vcodec libvpx -vf scale=480:320 -r 13 -g 120 -level 216 -profile 0 -qmax 42 -qmin 10 -rc_buf_aggressivity 0.95 -vb 480k -acodec libvorbis -ab 96000 -aq 90 -ac 2</params>
+    <params>-f webm -aspect 3:2 -c:v libvpx -vf scale=480:320 -r 13 -g 120 -level 216 -profile 0 -qmax 42 -qmin 10 -rc_buf_aggressivity 0.95 -vb 480k -c:a libvorbis -b:a 96000 -aq 90 -ac 2</params>
     <extension>webm</extension>
     <category>Google</category>
   </googleandroidwebm>
   <googleandroidwebmFS>
     <label>Google WebM for Andriod 2.3.3+ Fullscreen</label>
-    <params>-f webm -aspect 4:3 -vcodec libvpx -vf scale=432:320 -r 13 -g 120 -level 216 -profile 0 -qmax 42 -qmin 10 -rc_buf_aggressivity 0.95 -vb 480k -acodec libvorbis -ab 96k -aq 90 -ac 2</params>
+    <params>-f webm -aspect 4:3 -c:v libvpx -vf scale=432:320 -r 13 -g 120 -level 216 -profile 0 -qmax 42 -qmin 10 -rc_buf_aggressivity 0.95 -vb 480k -c:a libvorbis -b:a 96k -aq 90 -ac 2</params>
     <extension>webm</extension>
     <category>Google</category>
   </googleandroidwebmFS>
   <googleandroidwebmWS>
     <label>Google WebM for Andriod 2.3.3+ Widescreen</label>
-    <params>-f webm -aspect 16:9 -vcodec libvpx -vf scale=480:272 -r 13 -g 120 -level 216 -profile 0 -qmax 42 -qmin 10 -rc_buf_aggressivity 0.95 -vb 480k -acodec libvorbis -ab 96k -aq 90 -ac 2</params>
+    <params>-f webm -aspect 16:9 -c:v libvpx -vf scale=480:272 -r 13 -g 120 -level 216 -profile 0 -qmax 42 -qmin 10 -rc_buf_aggressivity 0.95 -vb 480k -c:a libvorbis -b:a 96k -aq 90 -ac 2</params>
     <extension>webm</extension>
     <category>Google</category>
   </googleandroidwebmWS>
   <googlewebmfs>
     <label>Google WebM Generic Fullscreen</label>
-    <params>-f webm -aspect 4:3 -vcodec libvpx -g 120 -level 216 -profile 0 -qmax 42 -qmin 10 -rc_buf_aggressivity 0.95 -vb 2M -acodec libvorbis -aq 90 -ac 2</params>
+    <params>-f webm -aspect 4:3 -c:v libvpx -g 120 -level 216 -profile 0 -qmax 42 -qmin 10 -rc_buf_aggressivity 0.95 -vb 2M -c:a libvorbis -aq 90 -ac 2</params>
     <extension>webm</extension>
     <category>Google</category>
   </googlewebmfs>
   <googlewebmws>
     <label>Google WebM Generic Widescreen</label>
-    <params>-f webm -aspect 16:9 -vcodec libvpx -g 120 -level 216 -profile 0 -qmax 42 -qmin 10 -rc_buf_aggressivity 0.95 -vb 2M -acodec libvorbis -aq 90 -ac 2</params>
+    <params>-f webm -aspect 16:9 -c:v libvpx -g 120 -level 216 -profile 0 -qmax 42 -qmin 10 -rc_buf_aggressivity 0.95 -vb 2M -c:a libvorbis -aq 90 -ac 2</params>
     <extension>webm</extension>
     <category>Google</category>
   </googlewebmws>
   <iPodiTunesIphoneWS>
     <label>iPhone WideScreen</label>
-    <params>-r 29.97 -vcodec libx264 -flags +loop -cmp +chroma -deblockalpha 0 -deblockbeta 0 -crf 21 -bt 256k -refs 1 -coder 0 -me_method full -me_range 16 -subq 5 -partitions +parti4x4+parti8x8+partp8x8 -g 250 -keyint_min 25 -level 30 -trellis 2 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 1 -qcomp 0.6 -qmin 0 -qmax 69 -qdiff 4 -bf 3 -refs 2 -directpred 1 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -rc_lookahead 30 -vf scale=480:320 -aspect 16:9 -acodec libfaac -ab 112k -ar 48000 -ac 2</params>
+    <params>-r 29.97 -c:v libx264 -flags +loop -cmp +chroma -deblockalpha 0 -deblockbeta 0 -crf 21 -bt 256k -refs 1 -coder 0 -me_method full -me_range 16 -subq 5 -partitions +parti4x4+parti8x8+partp8x8 -g 250 -keyint_min 25 -level 30 -trellis 2 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 1 -qcomp 0.6 -qmin 0 -qmax 69 -qdiff 4 -bf 3 -refs 2 -directpred 1 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -rc_lookahead 30 -vf scale=480:320 -aspect 16:9 -c:a aac -strict -2 -b:a 112k -ar 48000 -ac 2</params>
     <extension>m4v</extension>
     <category>iPod-iTunes</category>
   </iPodiTunesIphoneWS>
   <iPodiTunesSmallCRF21FS>
     <label>iPod Small Fullscreen</label>
-    <params>-r 29.97 -vcodec libx264 -flags +loop -cmp +chroma -deblockalpha 0 -deblockbeta 0 -crf 21 -bt 256k -refs 1 -coder 0 -me_method full -me_range 16 -subq 5 -partitions +parti4x4+parti8x8+partp8x8 -g 250 -keyint_min 25 -level 30 -trellis 2 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 1 -qcomp 0.6 -qmin 0 -qmax 69 -qdiff 4 -bf 3 -directpred 1 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -vf scale=320:240 -aspect 4:3 -acodec libfaac -ab 112k -ar 48000 -ac 2</params>
+    <params>-r 29.97 -c:v libx264 -flags +loop -cmp +chroma -deblockalpha 0 -deblockbeta 0 -crf 21 -bt 256k -refs 1 -coder 0 -me_method full -me_range 16 -subq 5 -partitions +parti4x4+parti8x8+partp8x8 -g 250 -keyint_min 25 -level 30 -trellis 2 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 1 -qcomp 0.6 -qmin 0 -qmax 69 -qdiff 4 -bf 3 -directpred 1 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -vf scale=320:240 -aspect 4:3 -c:a aac -strict -2 -b:a 112k -ar 48000 -ac 2</params>
     <extension>m4v</extension>
     <category>iPod-iTunes</category>
   </iPodiTunesSmallCRF21FS>
   <iPodiTunesSmallCRF21WS>
     <label>iPod Small WideScreen</label>
-    <params>-r 29.97 -vcodec libx264 -flags +loop -cmp +chroma -deblockalpha 0 -deblockbeta 0 -crf 21 -bt 256k -refs 1 -coder 0 -me_method full -me_range 16 -subq 5 -partitions +parti4x4+parti8x8+partp8x8 -g 250 -keyint_min 25 -level 30 -trellis 2 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 1 -qcomp 0.6 -qmin 0 -qmax 69 -qdiff 4 -bf 3 -refs 3 -directpred 1 -trellis 1 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -vf scale=320:176 -aspect 16:9 -acodec libfaac -ab 112k -ar 48000 -ac 2</params>
+    <params>-r 29.97 -c:v libx264 -flags +loop -cmp +chroma -deblockalpha 0 -deblockbeta 0 -crf 21 -bt 256k -refs 1 -coder 0 -me_method full -me_range 16 -subq 5 -partitions +parti4x4+parti8x8+partp8x8 -g 250 -keyint_min 25 -level 30 -trellis 2 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 1 -qcomp 0.6 -qmin 0 -qmax 69 -qdiff 4 -bf 3 -refs 3 -directpred 1 -trellis 1 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -vf scale=320:176 -aspect 16:9 -c:a aac -strict -2 -b:a 112k -ar 48000 -ac 2</params>
     <extension>m4v</extension>
     <category>iPod-iTunes</category>
   </iPodiTunesSmallCRF21WS>
   <iPodiTunesSmallCRF21WSAna>
     <label>iPod Small WideScreen Anamorphic</label>
-    <params>-r 29.97 -vf crop=iw:ih-2*60,scale=320:144 -vcodec libx264 -flags +loop -cmp +chroma -deblockalpha 0 -deblockbeta 0 -crf 21 -bt 256k -refs 1 -coder 0 -me_method full -me_range 16 -subq 5 -partitions +parti4x4+parti8x8+partp8x8 -g 250 -keyint_min 25 -level 30 -trellis 2 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 1 -qcomp 0.6 -qmin 0 -qmax 69 -qdiff 4 -bf 3 -directpred 1 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -aspect 2.35 -acodec libfaac -ab 112k -ar 48000 -ac 2</params>
+    <params>-r 29.97 -vf crop=iw:ih-2*60,scale=320:144 -c:v libx264 -flags +loop -cmp +chroma -deblockalpha 0 -deblockbeta 0 -crf 21 -bt 256k -refs 1 -coder 0 -me_method full -me_range 16 -subq 5 -partitions +parti4x4+parti8x8+partp8x8 -g 250 -keyint_min 25 -level 30 -trellis 2 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 1 -qcomp 0.6 -qmin 0 -qmax 69 -qdiff 4 -bf 3 -directpred 1 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -aspect 2.35 -c:a aac -strict -2 -b:a 112k -ar 48000 -ac 2</params>
     <extension>m4v</extension>
     <category>iPod-iTunes</category>
   </iPodiTunesSmallCRF21WSAna>
   <iPodiTunesSmallCRF21WSLBFix>
     <label>iPod Small Converted to WideScreen</label>
-    <params>-r 29.97 -vf crop=iw:ih-2*64,scale=320:176 -vcodec libx264 -flags +loop -cmp +chroma -deblockalpha 0 -deblockbeta 0 -crf 21 -bt 256k -refs 1 -coder 0 -me_method full -me_range 16 -subq 5 -partitions +parti4x4+parti8x8+partp8x8 -g 250 -keyint_min 25 -level 30 -trellis 2 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 1 -qcomp 0.6 -qmin 0 -qmax 69 -qdiff 4 -bf 3 -directpred 1 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -aspect 16:9 -acodec libfaac -ab 112k -ar 48000 -ac 2</params>
+    <params>-r 29.97 -vf crop=iw:ih-2*64,scale=320:176 -c:v libx264 -flags +loop -cmp +chroma -deblockalpha 0 -deblockbeta 0 -crf 21 -bt 256k -refs 1 -coder 0 -me_method full -me_range 16 -subq 5 -partitions +parti4x4+parti8x8+partp8x8 -g 250 -keyint_min 25 -level 30 -trellis 2 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 1 -qcomp 0.6 -qmin 0 -qmax 69 -qdiff 4 -bf 3 -directpred 1 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -aspect 16:9 -c:a aac -strict -2 -b:a 112k -ar 48000 -ac 2</params>
     <extension>m4v</extension>
     <category>iPod-iTunes</category>
   </iPodiTunesSmallCRF21WSLBFix>
   <iPodiTunesTVOutCRF21FS>
     <label>iPod TV Out Fullscreen</label>
-    <params>-r 29.97 -vcodec libx264 -flags +loop -cmp +chroma -deblockalpha 0 -deblockbeta 0 -crf 21 -bt 256k -refs 1 -coder 0 -me_method full -me_range 16 -subq 5 -partitions +parti4x4+parti8x8+partp8x8 -g 250 -keyint_min 25 -level 30 -trellis 2 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 1 -qcomp 0.6 -qmin 0 -qmax 69 -qdiff 4 -bf 3 -directpred 1 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -vf scale=512:384 -aspect 4:3 -acodec libfaac -ab 112k -ar 48000 -ac 2</params>
+    <params>-r 29.97 -c:v libx264 -flags +loop -cmp +chroma -deblockalpha 0 -deblockbeta 0 -crf 21 -bt 256k -refs 1 -coder 0 -me_method full -me_range 16 -subq 5 -partitions +parti4x4+parti8x8+partp8x8 -g 250 -keyint_min 25 -level 30 -trellis 2 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 1 -qcomp 0.6 -qmin 0 -qmax 69 -qdiff 4 -bf 3 -directpred 1 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -vf scale=512:384 -aspect 4:3 -c:a aac -strict -2 -b:a 112k -ar 48000 -ac 2</params>
     <extension>m4v</extension>
     <category>iPod-iTunes</category>
   </iPodiTunesTVOutCRF21FS>
   <iPodiTunesTVOutCRF21WS>
     <label>iPod TV Out Widescreen</label>
-    <params>-r 29.97 -vcodec libx264 -flags +loop -cmp +chroma -deblockalpha 0 -deblockbeta 0 -crf 21 -bt 256k -refs 1 -coder 0 -me_method full -me_range 16 -subq 5 -partitions +parti4x4+parti8x8+partp8x8 -g 250 -keyint_min 25 -level 30 -trellis 2 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 1 -qcomp 0.6 -qmin 0 -qmax 69 -qdiff 4 -bf 3 -directpred 1 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -vf scale=624:352 -aspect 16:9 -acodec libfaac -ab 112k -ar 48000 -ac 2</params>
+    <params>-r 29.97 -c:v libx264 -flags +loop -cmp +chroma -deblockalpha 0 -deblockbeta 0 -crf 21 -bt 256k -refs 1 -coder 0 -me_method full -me_range 16 -subq 5 -partitions +parti4x4+parti8x8+partp8x8 -g 250 -keyint_min 25 -level 30 -trellis 2 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 1 -qcomp 0.6 -qmin 0 -qmax 69 -qdiff 4 -bf 3 -directpred 1 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -vf scale=624:352 -aspect 16:9 -c:a aac -strict -2 -b:a 112k -ar 48000 -ac 2</params>
     <extension>m4v</extension>
     <category>iPod-iTunes</category>
   </iPodiTunesTVOutCRF21WS>
   <iPodiTunesTVOutCRF21WSAna>
     <label>iPod TV Out Widescreen Anamorphic</label>
-    <params>-r 29.97 -vf crop=iw:ih-2*60,scale=640:272 -vcodec libx264 -flags +loop -cmp +chroma -deblockalpha 0 -deblockbeta 0 -crf 21 -bt 256k -refs 1 -coder 0 -me_method full -me_range 16 -subq 5 -partitions +parti4x4+parti8x8+partp8x8 -g 250 -keyint_min 25 -level 30 -trellis 2 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 1 -qcomp 0.6 -qmin 0 -qmax 69 -qdiff 4 -bf 3 -directpred 1 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -aspect 2.35 -acodec libfaac -ab 112k -ar 48000 -ac 2</params>
+    <params>-r 29.97 -vf crop=iw:ih-2*60,scale=640:272 -c:v libx264 -flags +loop -cmp +chroma -deblockalpha 0 -deblockbeta 0 -crf 21 -bt 256k -refs 1 -coder 0 -me_method full -me_range 16 -subq 5 -partitions +parti4x4+parti8x8+partp8x8 -g 250 -keyint_min 25 -level 30 -trellis 2 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 1 -qcomp 0.6 -qmin 0 -qmax 69 -qdiff 4 -bf 3 -directpred 1 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -aspect 2.35 -c:a aac -strict -2 -b:a 112k -ar 48000 -ac 2</params>
     <extension>m4v</extension>
     <category>iPod-iTunes</category>
   </iPodiTunesTVOutCRF21WSAna>
   <iPodiTunesTVOutCRF21WSLBFix>
     <label>iPod TV Out Converted to Widescreen</label>
-    <params>-r 29.97 -vf crop=iw:ih-2*64,scale=640:352 -vcodec libx264 -flags +loop -cmp +chroma -deblockalpha 0 -deblockbeta 0 -crf 21 -bt 256k -refs 1 -coder 0 -me_method full -me_range 16 -subq 5 -partitions +parti4x4+parti8x8+partp8x8 -g 250 -keyint_min 25 -level 30 -trellis 2 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 1 -qcomp 0.6 -qmin 0 -qmax 69 -qdiff 4 -bf 3 -directpred 1 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -aspect 16:9 -acodec libfaac -ab 112k -ar 48000 -ac 2</params>
+    <params>-r 29.97 -vf crop=iw:ih-2*64,scale=640:352 -c:v libx264 -flags +loop -cmp +chroma -deblockalpha 0 -deblockbeta 0 -crf 21 -bt 256k -refs 1 -coder 0 -me_method full -me_range 16 -subq 5 -partitions +parti4x4+parti8x8+partp8x8 -g 250 -keyint_min 25 -level 30 -trellis 2 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 1 -qcomp 0.6 -qmin 0 -qmax 69 -qdiff 4 -bf 3 -directpred 1 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -aspect 16:9 -c:a aac -strict -2 -b:a 112k -ar 48000 -ac 2</params>
     <extension>m4v</extension>
     <category>iPod-iTunes</category>
   </iPodiTunesTVOutCRF21WSLBFix>
   <lgchocolate>
     <label>LG Chocolate</label>
-    <params>-f mp4 -vf scale=240:192 -aspect 240:192 -r 11.988 -b 192k -ab 56k -vcodec libxvid -acodec libfaac -ar 22050</params>
+    <params>-f mp4 -vf scale=240:192 -aspect 240:192 -r 11.988 -b:v 192k -b:a 56k -c:v libxvid -c:a aac -strict -2 -ar 22050</params>
     <extension>mp4</extension>
     <category>LG</category>
   </lgchocolate>
   <lgdare>
     <label>LG Dare</label>
-    <params>-f mp4 -vf scale=320:240 -aspect 320:240 -r 11.988 -b 160k -ab 56k -vcodec libxvid -acodec libfaac</params>
+    <params>-f mp4 -vf scale=320:240 -aspect 320:240 -r 11.988 -b:v 160k -b:a 56k -c:v libxvid -c:a aac -strict -2</params>
     <extension>mp4</extension>
     <category>LG</category>
   </lgdare>
   <mp3>
     <label>MP3</label>
-    <params>-acodec libmp3lame -ab 160k -ac 2 -ar 44100</params>
+    <params>-c:a libmp3lame -b:a 160k -ac 2 -ar 44100</params>
     <extension>mp3</extension>
     <category>Audio</category>
   </mp3>
   <mp3m>
     <label>MP3 (Mono)</label>
-    <params>-acodec libmp3lame -ab 32k -ac 1 -ar 22050</params>
+    <params>-c:a libmp3lame -b:a 32k -ac 1 -ar 22050</params>
     <extension>mp3</extension>
     <category>Mobile Phones</category>
   </mp3m>
   <nanoFS>
     <label>RB Apple iPod Nano Fullscreen</label>
-    <params>-acodec libmp3lame -ab 128k -ar 44100 -vcodec mpeg2video -vf scale=176:128 -b 256k -strict -1</params>
+    <params>-c:a libmp3lame -b:a 128k -ar 44100 -c:v mpeg2video -vf scale=176:128 -b:v 256k -strict -1</params>
     <extension>mpg</extension>
     <category>Rockbox</category>
   </nanoFS>
   <nanoWS>
     <label>RB Apple iPod Nano Widescreen</label>
-    <params>-acodec libmp3lame -ab 128k -ar 44100 -vcodec mpeg2video -vf scale=176:128 -b 256k -strict -1</params>
+    <params>-c:a libmp3lame -b:a 128k -ar 44100 -c:v mpeg2video -vf scale=176:128 -b:v 256k -strict -1</params>
     <extension>mpg</extension>
     <category>Rockbox</category>
   </nanoWS>
   <ntscdvdgoodqFS>
     <label>NTSC DVD Fullscreen</label>
-    <params>-f dvd -vcodec mpeg2video -r 29.97 -vf scale=352:480 -aspect 4:3 -b 4000k -mbd rd -trellis 1 -flags +mv0 -cmp 2 -subcmp 2 -acodec mp2 -ab 192k -ar 48000 -ac 2</params>
+    <params>-f dvd -c:v mpeg2video -r 29.97 -vf scale=352:480 -aspect 4:3 -b:v 4000k -mbd rd -trellis 1 -flags +mv0 -cmp 2 -subcmp 2 -c:a mp2 -b:a 192k -ar 48000 -ac 2</params>
     <extension>mpg</extension>
     <category>DVD</category>
   </ntscdvdgoodqFS>
   <ntscdvdgoodqWS>
     <label>NTSC DVD Widescreen</label>
-    <params>-f dvd -vcodec mpeg2video -r 29.97 -vf scale=352:480 -aspect 16:9 -b 4000k -mbd rd -trellis 1 -flags +mv0 -cmp 2 -subcmp 2 -acodec mp2 -ab 192k -ar 48000 -ac 2</params>
+    <params>-f dvd -c:v mpeg2video -r 29.97 -vf scale=352:480 -aspect 16:9 -b:v 4000k -mbd rd -trellis 1 -flags +mv0 -cmp 2 -subcmp 2 -c:a mp2 -b:a 192k -ar 48000 -ac 2</params>
     <extension>mpg</extension>
     <category>DVD</category>
   </ntscdvdgoodqWS>
@@ -536,7 +536,7 @@
   </ntscdvdhqWS>
   <ntscdvdlq>
     <label>NTSC DVD Fast (LQ)</label>
-    <params>-f dvd -target ntsc-dvd -b 5000k -r 29.97 -vf scale=720:480 -ar 48000 -ab 384k</params>
+    <params>-f dvd -target ntsc-dvd -b:v 5000k -r 29.97 -vf scale=720:480 -ar 48000 -b:a 384k</params>
     <extension>mpg</extension>
     <category>DVD</category>
   </ntscdvdlq>
@@ -548,19 +548,19 @@
   </ntscvcdhq>
   <ogg1>
     <label>OGG</label>
-    <params>-acodec libvorbis -aq 3 -vn -ac 2</params>
+    <params>-c:a libvorbis -aq 3 -vn -ac 2</params>
     <extension>ogg</extension>
     <category>Audio</category>
   </ogg1>
   <paldvdgoodqFS>
     <label>PAL DVD Fullscreen</label>
-    <params>-f dvd -vcodec mpeg2video -r 25.00 -vf scale=352:576 -aspect 4:3 -b 4000k -mbd rd -trellis 1 -flags +mv0 -cmp 2 -subcmp 2 -acodec mp2 -ab 192k -ar 48000 -ac 2</params>
+    <params>-f dvd -c:v mpeg2video -r 25.00 -vf scale=352:576 -aspect 4:3 -b:v 4000k -mbd rd -trellis 1 -flags +mv0 -cmp 2 -subcmp 2 -c:a mp2 -b:a 192k -ar 48000 -ac 2</params>
     <extension>mpg</extension>
     <category>DVD</category>
   </paldvdgoodqFS>
   <paldvdgoodqWS>
     <label>PAL DVD Widescreen</label>
-    <params>-f dvd -vcodec mpeg2video -r 25.00 -vf scale=352:576 -aspect 16:9 -b 4000k -mbd rd -trellis 1 -flags +mv0 -cmp 2 -subcmp 2 -acodec mp2 -ab 192k -ar 48000 -ac 2</params>
+    <params>-f dvd -c:v mpeg2video -r 25.00 -vf scale=352:576 -aspect 16:9 -b:v 4000k -mbd rd -trellis 1 -flags +mv0 -cmp 2 -subcmp 2 -c:a mp2 -b:a 192k -ar 48000 -ac 2</params>
     <extension>mpg</extension>
     <category>DVD</category>
   </paldvdgoodqWS>
@@ -578,7 +578,7 @@
   </paldvdhqWS>
   <paldvdlq>
     <label>PAL DVD Fast (LQ)</label>
-    <params>-f dvd -target pal-dvd -b 5000k -r 25 -vf scale=720:576 -ar 48000 -ab 384k</params>
+    <params>-f dvd -target pal-dvd -b:v 5000k -r 25 -vf scale=720:576 -ar 48000 -b:a 384k</params>
     <extension>mpg</extension>
     <category>DVD</category>
   </paldvdlq>
@@ -590,109 +590,109 @@
   </palvcdhq>
   <ps3720p>
     <label>PS3 720p Widescreen</label>
-    <params>-f mp4 -r 23.976 -vcodec libx264 -vf scale=1280:720 -b 3000k -aspect 16:9 -flags +loop -cmp +chroma -deblockalpha 0 -deblockbeta 0 -maxrate 3500k -bufsize 4M -bt 256k -refs 1 -bf 3 -coder 1 -me_method umh -me_range 16 -subq 7 -partitions +parti4x4+parti8x8+partp8x8+partb8x8 -g 250 -keyint_min 25 -level 30 -qmin 10 -qmax 51 -qcomp 0.6 -trellis 2 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 2 -qdiff 4 -directpred 3 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -rc_lookahead 50 -acodec libfaac -ab 384k -ar 48000 -ac 2</params>
+    <params>-f mp4 -r 23.976 -c:v libx264 -vf scale=1280:720 -b:v 3000k -aspect 16:9 -flags +loop -cmp +chroma -deblockalpha 0 -deblockbeta 0 -maxrate 3500k -bufsize 4M -bt 256k -refs 1 -bf 3 -coder 1 -me_method umh -me_range 16 -subq 7 -partitions +parti4x4+parti8x8+partp8x8+partb8x8 -g 250 -keyint_min 25 -level 30 -qmin 10 -qmax 51 -qcomp 0.6 -trellis 2 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 2 -qdiff 4 -directpred 3 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -rc_lookahead 50 -c:a aac -strict -2 -b:a 384k -ar 48000 -ac 2</params>
     <extension>mp4</extension>
     <category>PS3</category>
   </ps3720p>
   <ps3720pfs>
     <label>PS3 720p Fullscreen</label>
-    <params>-f mp4 -r 23.976 -vcodec libx264 -vf scale=1280:720 -b 3000k -aspect 4:3 -flags +loop -cmp +chroma -deblockalpha 0 -deblockbeta 0 -maxrate 3500k -bufsize 4M -bt 256k -refs 1 -bf 3 -coder 1 -me_method umh -me_range 16 -subq 7 -partitions +parti4x4+parti8x8+partp8x8+partb8x8 -g 250 -keyint_min 25 -level 30 -qmin 10 -qmax 51 -qcomp 0.6 -trellis 2 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 2 -qdiff 4 -directpred 3 -trellis 1 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -rc_lookahead 50 -acodec libfaac -ab 384k -ar 48000 -ac 2</params>
+    <params>-f mp4 -r 23.976 -c:v libx264 -vf scale=1280:720 -b:v 3000k -aspect 4:3 -flags +loop -cmp +chroma -deblockalpha 0 -deblockbeta 0 -maxrate 3500k -bufsize 4M -bt 256k -refs 1 -bf 3 -coder 1 -me_method umh -me_range 16 -subq 7 -partitions +parti4x4+parti8x8+partp8x8+partb8x8 -g 250 -keyint_min 25 -level 30 -qmin 10 -qmax 51 -qcomp 0.6 -trellis 2 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 2 -qdiff 4 -directpred 3 -trellis 1 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -rc_lookahead 50 -c:a aac -strict -2 -b:a 384k -ar 48000 -ac 2</params>
     <extension>mp4</extension>
     <category>PS3</category>
   </ps3720pfs>
   <qmov>
     <label>Quicktime MOV</label>
-    <params>-f mov -acodec libfaac -b 1250k -r 25 -ab 128k -vf scale=640:480 -ac 2 -ar 48000</params>
+    <params>-f mov -c:a aac -strict -2 -b:v 1250k -r 25 -b:a 128k -vf scale=640:480 -ac 2 -ar 48000</params>
     <extension>mov</extension>
     <category>QuickTime</category>
   </qmov>
   <qmovhq>
     <label>QuickTime H.264 video (high quality)</label>
-    <params>-crf 35.0 -vcodec libx264 -acodec libfaac -ar 48000 -ab 128k -coder 1 -flags +loop -cmp +chroma -partitions +parti4x4+partp8x8+partb8x8 -me_method hex -subq 6 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 1 -qcomp 0.6 -qmin 0 -qmax 69 -qdiff 4 -bf 3 -refs 5 -directpred 3 -trellis 1 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -rc_lookahead 50 -threads 0</params>
+    <params>-crf 35.0 -c:v libx264 -c:a aac -strict -2 -ar 48000 -b:a 128k -coder 1 -flags +loop -cmp +chroma -partitions +parti4x4+partp8x8+partb8x8 -me_method hex -subq 6 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 1 -qcomp 0.6 -qmin 0 -qmax 69 -qdiff 4 -bf 3 -refs 5 -directpred 3 -trellis 1 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -rc_lookahead 50 -threads 0</params>
     <extension>mov</extension>
     <category>QuickTime</category>
   </qmovhq>
   <qmovshq>
     <label>QuickTime H.264 video (super high quality)</label>
-    <params>-crf 15.0 -vcodec libx264 -acodec libfaac -ar 48000 -ab 192k -coder 1 -flags +loop -cmp +chroma -partitions +parti4x4+partp8x8+partb8x8 -me_method hex -subq 6 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 1 -qcomp 0.6 -qmin 0 -qmax 69 -qdiff 4 -bf 8 -refs 16 -directpred 3 -trellis 2 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -rc_lookahead 60 -threads 0</params>
+    <params>-crf 15.0 -c:v libx264 -c:a aac -strict -2 -ar 48000 -b:a 192k -coder 1 -flags +loop -cmp +chroma -partitions +parti4x4+partp8x8+partb8x8 -me_method hex -subq 6 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 1 -qcomp 0.6 -qmin 0 -qmax 69 -qdiff 4 -bf 8 -refs 16 -directpred 3 -trellis 2 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -rc_lookahead 60 -threads 0</params>
     <extension>mov</extension>
     <category>QuickTime</category>
   </qmovshq>
   <qmovvhq>
     <label>QuickTime H.264 video (very high quality)</label>
-    <params>-crf 25.0 -vcodec libx264 -acodec libfaac -ar 48000 -ab 160k -coder 1 -flags +loop -cmp +chroma -partitions +parti4x4+partp8x8+partb8x8 -me_method hex -subq 6 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 1 -qcomp 0.6 -qmin 0 -qmax 69 -qdiff 4 -bf 3 -refs 8 -directpred 3 -trellis 2 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -rc_lookahead 60 -threads 0</params>
+    <params>-crf 25.0 -c:v libx264 -c:a aac -strict -2 -ar 48000 -b:a 160k -coder 1 -flags +loop -cmp +chroma -partitions +parti4x4+partp8x8+partb8x8 -me_method hex -subq 6 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 1 -qcomp 0.6 -qmin 0 -qmax 69 -qdiff 4 -bf 3 -refs 8 -directpred 3 -trellis 2 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -rc_lookahead 60 -threads 0</params>
     <extension>mov</extension>
     <category>QuickTime</category>
   </qmovvhq>
   <tuna-Vids>
     <label>Tuna-vIDS</label>
-    <params>-f avi -r 10 -vf scale=256:192 -aspect 256:192 -b 192k -bt 64k -vcodec libxvid -deinterlace -acodec libmp3lame -ar 32000 -ab 96k -ac 2</params>
+    <params>-f avi -r 10 -vf scale=256:192 -aspect 256:192 -b:v 192k -bt 64k -c:v libxvid -deinterlace -c:a libmp3lame -ar 32000 -b:a 96k -ac 2</params>
     <extension>avi</extension>
     <category>Tuna-Vids</category>
   </tuna-Vids>
   <walkmanXviDFS>
     <label>Xvid walkman (4:3)</label>
-    <params>-r 29.97 -vcodec libxvid -vf scale=320:240 -aspect 4:3 -maxrate 1500k -b 1250k -qmin 3 -qmax 5 -bufsize 4096 -mbd 2 -cmp 2 -subcmp 2 -g 300 -acodec libfaac -ar 48000 -ab 80k -ac 2</params>
+    <params>-r 29.97 -c:v libxvid -vf scale=320:240 -aspect 4:3 -maxrate 1500k -b:v 1250k -qmin 3 -qmax 5 -bufsize 4096 -mbd 2 -cmp 2 -subcmp 2 -g 300 -c:a aac -strict -2 -ar 48000 -b:a 80k -ac 2</params>
     <extension>mp4</extension>
     <category>walkman</category>
   </walkmanXviDFS>
   <wma>
     <label>WMA</label>
-    <params>-vn -acodec wmav2 -ab 160k</params>
+    <params>-vn -c:a wmav2 -b:a 160k</params>
     <extension>wma</extension>
     <category>Audio</category>
   </wma>
   <wmv>
     <label>WMV2 Generic</label>
-    <params>-vcodec wmv2 -acodec wmav2 -b 1000k -ab 160k -r 25</params>
+    <params>-c:v wmv2 -c:a wmav2 -b:v 1000k -b:a 160k -r 25</params>
     <extension>wmv</extension>
     <category>WMV</category>
   </wmv>
   <wmv2broadband>
     <label>WMV for Web Use</label>
-    <params>-vcodec wmv2 -acodec wmav2 -b 640k -ab 128k -r 29.97 -vf scale=320:240</params>
+    <params>-c:v wmv2 -c:a wmav2 -b:v 640k -b:a 128k -r 29.97 -vf scale=320:240</params>
     <extension>wmv</extension>
     <category>WMV</category>
   </wmv2broadband>
   <wmv2xbox360>
     <label>Xbox 360</label>
-    <params>-vcodec wmv2 -acodec wmav2 -b 1200k -ab 160k -r 25 -vf scale=720:480</params>
+    <params>-c:v wmv2 -c:a wmav2 -b:v 1200k -b:a 160k -r 25 -vf scale=720:480</params>
     <extension>wmv</extension>
     <category>WMV</category>
   </wmv2xbox360>
   <wmv2zune>
     <label>Zune</label>
-    <params>-vcodec wmv2 -acodec wmav2 -b 640k -ab 128k -r 23.97 -vf scale=320:240</params>
+    <params>-c:v wmv2 -c:a wmav2 -b:v 640k -b:a 128k -r 23.97 -vf scale=320:240</params>
     <extension>wmv</extension>
     <category>WMV</category>
   </wmv2zune>
   <wmv4powerpoint>
     <label>Power Point</label>
-    <params>-vcodec wmv2 -acodec wmav2 -aspect 4:3 -b 500k -ab 32k -ac 1 -ar 22050 -vf scale=320:240</params>
+    <params>-c:v wmv2 -c:a wmav2 -aspect 4:3 -b:v 500k -b:a 32k -ac 1 -ar 22050 -vf scale=320:240</params>
     <extension>wmv</extension>
     <category>WMV</category>
   </wmv4powerpoint>
   <x264HQFS>
     <label>MP4 Fullscreen</label>
-    <params>-f mp4 -r 29.97 -vcodec libx264 -vf scale=640:480 -b 1000k -aspect 4:3 -flags +loop -cmp +chroma -deblockalpha 0 -deblockbeta 0 -b 1250k -maxrate 1500k -bufsize 4M -bt 256k -refs 1 -bf 3 -coder 1 -me_method umh -me_range 16 -subq 7 -partitions +parti4x4+parti8x8+partp8x8+partb8x8 -g 250 -keyint_min 25 -level 30 -qmin 10 -qmax 51 -qcomp 0.6 -trellis 2 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 2 -qdiff 4 -directpred 3 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -rc_lookahead 50 -acodec libfaac -ab 112k -ar 48000 -ac 2</params>
+    <params>-f mp4 -r 29.97 -c:v libx264 -vf scale=640:480 -b:v 1000k -aspect 4:3 -flags +loop -cmp +chroma -deblockalpha 0 -deblockbeta 0 -b:v 1250k -maxrate 1500k -bufsize 4M -bt 256k -refs 1 -bf 3 -coder 1 -me_method umh -me_range 16 -subq 7 -partitions +parti4x4+parti8x8+partp8x8+partb8x8 -g 250 -keyint_min 25 -level 30 -qmin 10 -qmax 51 -qcomp 0.6 -trellis 2 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 2 -qdiff 4 -directpred 3 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -rc_lookahead 50 -c:a aac -strict -2 -b:a 112k -ar 48000 -ac 2</params>
     <extension>mp4</extension>
     <category>MPEG-4</category>
   </x264HQFS>
   <x264HQPSP169robertswain>
     <label>PSP Widescreen</label>
-    <params>-f mp4 -r 29.97 -vcodec libx264 -vf scale=480:272 -aspect 16:9 -b 1250k -maxrate 4M -bufsize 4M -flags +loop -cmp +chroma -partitions +parti4x4+partp8x8+partb8x8 -me_method umh -subq 6 -trellis 1 -refs 2 -bf 1 -coder 1 -me_range 16 -g 300 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -bt 1250k -qcomp 0.6 -qmin 10 -qmax 51 -qdiff 4 -level 21 -b_strategy 2 -directpred 3 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -rc_lookahead 50 -acodec libfaac -ab 128k -ar 48000 -ac 2</params>
+    <params>-f mp4 -r 29.97 -c:v libx264 -vf scale=480:272 -aspect 16:9 -b:v 1250k -maxrate 4M -bufsize 4M -flags +loop -cmp +chroma -partitions +parti4x4+partp8x8+partb8x8 -me_method umh -subq 6 -trellis 1 -refs 2 -bf 1 -coder 1 -me_range 16 -g 300 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -bt 1250k -qcomp 0.6 -qmin 10 -qmax 51 -qdiff 4 -level 21 -b_strategy 2 -directpred 3 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -rc_lookahead 50 -c:a aac -strict -2 -b:a 128k -ar 48000 -ac 2</params>
     <extension>mp4</extension>
     <category>PSP</category>
   </x264HQPSP169robertswain>
   <x264HQPSP43>
     <label>PSP Fullscreen</label>
-    <params>-f mp4 -r 29.97 -vcodec libx264 -vf scale=640:480 -aspect 4:3 -b 1250k -maxrate 4M -bufsize 4M -flags +loop -cmp +chroma -partitions +parti4x4+partp8x8+partb8x8 -me_method umh -subq 6 -trellis 1 -refs 2 -bf 1 -coder 1 -me_range 16 -g 300 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -bt 1250k -qcomp 0.6 -qmin 10 -qmax 51 -qdiff 4 -b_strategy 2 -directpred 3 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -rc_lookahead 50 -level 21 -acodec libfaac -ab 128k -ar 48000 -ac 2</params>
+    <params>-f mp4 -r 29.97 -c:v libx264 -vf scale=640:480 -aspect 4:3 -b:v 1250k -maxrate 4M -bufsize 4M -flags +loop -cmp +chroma -partitions +parti4x4+partp8x8+partb8x8 -me_method umh -subq 6 -trellis 1 -refs 2 -bf 1 -coder 1 -me_range 16 -g 300 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -bt 1250k -qcomp 0.6 -qmin 10 -qmax 51 -qdiff 4 -b_strategy 2 -directpred 3 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -rc_lookahead 50 -level 21 -c:a aac -strict -2 -b:a 128k -ar 48000 -ac 2</params>
     <extension>mp4</extension>
     <category>PSP</category>
   </x264HQPSP43>
   <x264HQWS>
     <label>MP4 Widescreen</label>
-    <params>-f mp4 -r 29.97 -vcodec libx264 -vf scale=704:384 -b 1000k -aspect 16:9 -flags +loop -cmp +chroma -deblockalpha 0 -deblockbeta 0 -b 1250k -maxrate 1500k -bufsize 4M -bt 256k -refs 1 -bf 3 -coder 1 -me_method umh -me_range 16 -subq 7 -partitions +parti4x4+parti8x8+partp8x8+partb8x8 -g 250 -keyint_min 25 -level 30 -qmin 10 -qmax 51 -qcomp 0.6 -trellis 2 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 2 -qdiff 4 -directpred 3 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -rc_lookahead 50 -acodec libfaac -ab 112k -ar 48000 -ac 2</params>
+    <params>-f mp4 -r 29.97 -c:v libx264 -vf scale=704:384 -b:v 1000k -aspect 16:9 -flags +loop -cmp +chroma -deblockalpha 0 -deblockbeta 0 -b:v 1250k -maxrate 1500k -bufsize 4M -bt 256k -refs 1 -bf 3 -coder 1 -me_method umh -me_range 16 -subq 7 -partitions +parti4x4+parti8x8+partp8x8+partb8x8 -g 250 -keyint_min 25 -level 30 -qmin 10 -qmax 51 -qcomp 0.6 -trellis 2 -sc_threshold 40 -i_qfactor 0.71 -b_strategy 2 -qdiff 4 -directpred 3 -flags2 +bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp 2 -rc_lookahead 50 -c:a aac -strict -2 -b:a 112k -ar 48000 -ac 2</params>
     <extension>mp4</extension>
     <category>MPEG-4</category>
   </x264HQWS>