diff --git a/formats.cfg b/formats.cfg
index 06765dc..60e9e00 100644
--- a/formats.cfg
+++ b/formats.cfg
@@ -31,7 +31,7 @@ type = audio
 ab = 112k
 afreq = 48000
 ach = default 2
-acodec = libvo_aacenc aac
+acodec = aac
 ext = m4a
 
 [CDMA Phone Audio (3g2)]
@@ -39,7 +39,7 @@ type = audio
 ab = 128k
 ach = default
 afreq = 22050
-acodec = libvo_aacenc aac
+acodec = aac
 ff = 3g2
 ext = 3g2
 
@@ -161,7 +161,7 @@ type = video
 ab = 64k 96k 128k 196k 256k
 afreq = 44100 8000 16000 22050 32000
 ach = default 2 1
-acodec = libvo_aacenc aac
+acodec = aac
 def_ab = 128k
 vb = 200k 320k 500k 700k 1100k 1500K
 def_vb = 1100k
@@ -209,7 +209,7 @@ type = video
 ab = 64k 96k 128k 196k 256k
 afreq = 44100 8000 16000 22050 32000
 ach = default 2 1
-acodec = libvo_aacenc aac adpcm_ima_qt libmp3lame mp2
+acodec = aac adpcm_ima_qt libmp3lame mp2
 def_ab = 128k
 vb = 200k 320k 500k 700k 1100k 1500K
 def_vb = 1100k
@@ -275,7 +275,7 @@ type = video
 ab = 64k 16k 32k 96k 128k 192k 256k
 afreq = 8000 16000 22050 32000 44100
 ach = 2
-acodec = libvo_aacenc aac
+acodec = aac
 def_ab = 64k
 vb = 40k 80k 100k 160k 200k 320k 500k 700k
 def_vb = 100k
@@ -292,7 +292,7 @@ type = video
 ab = 128k
 afreq = 48000
 ach = default
-acodec = libvo_aacenc aac
+acodec = aac
 vb = 800k 1000k
 vfps = default
 vcodec = libx264
@@ -307,7 +307,7 @@ type = video
 ab = 160k
 afreq = 48000
 ach = default
-acodec = libvo_aacenc aac
+acodec = aac
 vb = 800k 1000k
 vfps = default
 vcodec = libx264
@@ -322,7 +322,7 @@ type = video
 ab = 192k
 afreq = 48000
 ach = default
-acodec = libvo_aacenc aac
+acodec = aac
 vb = 800k 1000k
 vfps = default
 vcodec = libx264
@@ -338,7 +338,7 @@ type = video
 ab = 112k
 afreq = 48000
 ach = default 2
-acodec = libvo_aacenc aac
+acodec = aac
 vb = 1250k
 vfps = 29.97
 vcodec = libx264
@@ -353,7 +353,7 @@ type = video
 ab = 112k
 afreq = 48000
 ach = default 2
-acodec = libvo_aacenc aac
+acodec = aac
 vb = 1250k
 vfps = 29.97
 vcodec = libx264
@@ -607,7 +607,7 @@ type = video
 ab = 48k
 afreq = 22050
 ach = 2
-acodec = libvo_aacenc aac
+acodec = aac
 vb = 400k
 vfps = 24
 vcodec = mpeg4
@@ -622,7 +622,7 @@ type = video
 ab = 48k
 afreq = 22050
 ach = 2
-acodec = libvo_aacenc aac
+acodec = aac
 vb = 400k
 vfps = 24
 vcodec = mpeg4
@@ -637,7 +637,7 @@ type = video
 ab = 80k
 afreq = 44100
 ach = 2
-acodec = libvo_aacenc aac
+acodec = aac
 vb = 400k
 vfps = 24
 vcodec = libx264
@@ -652,7 +652,7 @@ type = video
 ab = 80k
 afreq = 44100
 ach = 2
-acodec = libvo_aacenc aac
+acodec = aac
 vb = 400k
 vfps = 24
 vcodec = libx264
@@ -690,7 +690,7 @@ type = video
 ab = 80k
 afreq = 48000
 ach = 2
-acodec = libvo_aacenc aac
+acodec = aac
 vb = 1250k
 vfps = 29.97
 vcodec = libxvid
@@ -705,7 +705,7 @@ type = video
 ab = 80k
 afreq = 44100
 ach = 2
-acodec = libvo_aacenc aac
+acodec = aac
 vb = 500k
 vfps = 29.97
 vcodec = libxvid
@@ -720,7 +720,7 @@ type = video
 ab = 80k
 afreq = 44100
 ach = 2
-acodec = libvo_aacenc aac
+acodec = aac
 vb = 430k
 vfps = 29.97
 vcodec = libxvid
@@ -736,7 +736,7 @@ type = video
 ab = 384k
 afreq = 48000
 ach = 2
-acodec = libvo_aacenc aac
+acodec = aac
 vb = 3000k
 vfps = 23.976
 vcodec = libx264
@@ -751,7 +751,7 @@ type = video
 ab = 384k
 afreq = 48000
 ach = 2
-acodec = libvo_aacenc aac
+acodec = aac
 vb = 3000k
 vfps = 23.976
 vcodec = libx264
@@ -768,7 +768,7 @@ type = video
 ab = 128k
 afreq = 48000
 ach = 2
-acodec = libvo_aacenc aac
+acodec = aac
 vb = 1250k
 vfps = 29.97
 vcodec = libx264
@@ -783,7 +783,7 @@ type = video
 ab = 128k
 afreq = 48000
 ach = 2
-acodec = libvo_aacenc aac
+acodec = aac
 vb = 1250k
 vfps = 29.97
 vcodec = libx264
@@ -1162,7 +1162,7 @@ type = video
 ab = 96k
 afreq = default
 ach = default
-acodec = libvo_aacenc aac
+acodec = aac
 vb = 500k
 vfps = default
 vcodec = libx264
@@ -1176,7 +1176,7 @@ type = video
 ab = 96k
 afreq = default
 ach = default
-acodec = libvo_aacenc aac
+acodec = aac
 vb = 500k
 vfps = default
 vcodec = libx264
@@ -1221,7 +1221,7 @@ type = video
 ab = 112k
 afreq = 48000
 ach = 2
-acodec = libvo_aacenc aac
+acodec = aac
 vb = default
 vfps = 29.97
 vcodec = libx264
@@ -1235,7 +1235,7 @@ type = video
 ab = 112k
 afreq = 48000
 ach = 2
-acodec = libvo_aacenc aac
+acodec = aac
 vb = default
 vfps = 29.97
 vcodec = libx264
@@ -1249,7 +1249,7 @@ type = video
 ab = 112k
 afreq = 48000
 ach = 2
-acodec = libvo_aacenc aac
+acodec = aac
 vb = default
 vfps = 29.97
 vcodec = libx264
@@ -1263,7 +1263,7 @@ type = video
 ab = 112k
 afreq = 48000
 ach = 2
-acodec = libvo_aacenc aac
+acodec = aac
 vb = default
 vfps = 29.97
 vcodec = libx264
@@ -1277,7 +1277,7 @@ type = video
 ab = 112k
 afreq = 48000
 ach = 2
-acodec = libvo_aacenc aac
+acodec = aac
 vb = 
 vfps = 29.97
 vcodec = libx264
@@ -1291,7 +1291,7 @@ type = video
 ab = 112k
 afreq = 48000
 ach = 2
-acodec = libvo_aacenc aac
+acodec = aac
 vb = default
 vfps = 29.97
 vcodec = libx264
@@ -1305,7 +1305,7 @@ type = video
 ab = 112k
 afreq = 48000
 ach = 2
-acodec = libvo_aacenc aac
+acodec = aac
 vb = default
 vfps = 29.97
 vcodec = libx264
@@ -1319,7 +1319,7 @@ type = video
 ab = 112k
 afreq = 48000
 ach = 2
-acodec = libvo_aacenc aac
+acodec = aac
 vb = default
 vfps = 29.97
 vcodec = libx264
@@ -1333,7 +1333,7 @@ type = video
 ab = 112k
 afreq = 48000
 ach = 2
-acodec = libvo_aacenc aac
+acodec = aac
 vb = default
 vfps = 29.97
 vcodec = libx264
@@ -1348,7 +1348,7 @@ type = video
 ab = 56k
 afreq = 22050
 ach = default
-acodec = libvo_aacenc aac
+acodec = aac
 vb = 192k
 vfps = 11.988
 vcodec = libxvid
@@ -1363,7 +1363,7 @@ type = video
 ab = 56k
 afreq = default
 ach = default
-acodec = libvo_aacenc aac
+acodec = aac
 vb = 160k
 vfps = 11.988
 vcodec = libxvid
@@ -1420,7 +1420,7 @@ type = video
 ab = 96k
 afreq = 44100
 ach = 2
-acodec = libvo_aacenc aac
+acodec = aac
 vb = 320k
 vfps = 15
 vcodec = mpeg4
@@ -1435,7 +1435,7 @@ type = video
 ab = 96k
 afreq = 44100 
 ach = 2
-acodec = libvo_aacenc aac
+acodec = aac
 vb = 320k
 vfps = 15
 vcodec = mpeg4
@@ -1450,7 +1450,7 @@ type = video
 ab = 128k
 afreq = 48000
 ach = 2
-acodec = libvo_aacenc aac
+acodec = aac
 vb = 2000k
 vfps = 29.97
 vcodec = libxvid
@@ -1465,7 +1465,7 @@ type = video
 ab = 128k
 afreq = 48000
 ach = 2
-acodec = libvo_aacenc aac
+acodec = aac
 vb = 2000k
 vfps = 25
 vcodec = libxvid
@@ -1480,7 +1480,7 @@ type = video
 ab = 80k
 afreq = 48000
 ach = 2
-acodec = libvo_aacenc aac
+acodec = aac
 vb = 800k
 vfps = 29.97
 vcodec = libxvid
@@ -1495,7 +1495,7 @@ type = video
 ab = 80k
 afreq = 48000
 ach = 2
-acodec = libvo_aacenc aac
+acodec = aac
 vb = 800k
 vfps = 29.97
 vcodec = libxvid
@@ -1510,7 +1510,7 @@ type = video
 ab = 80k
 afreq = 48000
 ach = 2
-acodec = libvo_aacenc aac
+acodec = aac
 vb = 800k
 vfps = 25
 vcodec = libxvid
@@ -1525,7 +1525,7 @@ type = video
 ab = 80k
 afreq = 48000
 ach = 2
-acodec = libvo_aacenc aac
+acodec = aac
 vb = 800k
 vfps = 25
 vcodec = libxvid
@@ -1540,7 +1540,7 @@ type = video
 ab = 128k
 afreq = 48000
 ach = 2
-acodec = libvo_aacenc aac
+acodec = aac
 vb = 2500k
 vfps = 29.97
 vcodec = libxvid
@@ -1555,7 +1555,7 @@ type = video
 ab = 128k
 afreq = 48000
 ach = 2
-acodec = libvo_aacenc aac
+acodec = aac
 vb = 2500k
 vfps = 25
 vcodec = libxvid
@@ -1570,7 +1570,7 @@ type = video
 ab = 128k
 afreq = 48000
 ach = default
-acodec = libvo_aacenc aac
+acodec = aac
 vb = default
 vfps = default
 vcodec = libx264
@@ -1584,7 +1584,7 @@ type = video
 ab = 160k
 afreq = 48000
 ach = default
-acodec = libvo_aacenc aac
+acodec = aac
 vb = default
 vfps = default
 vcodec = libx264
@@ -1598,7 +1598,7 @@ type = video
 ab = 192k
 afreq = 48000
 ach = default
-acodec = libvo_aacenc aac
+acodec = aac
 vb = default
 vfps = default
 vcodec = libx264