Updated docs for the FHG/QAAC AAC encoder add-in's.

diff --git a/doc/FAQ.html b/doc/FAQ.html
index 33f5896..9221dc0 100644 (file)
--- a/doc/FAQ.html
+++ b/doc/FAQ.html
@@ -310,33 +310,35 @@ use any suitable archiver, such as <a href="http://rarlabs.com/download.htm" tar
 the LameXP directory, the AAC encoding option should be "enabled" on the next startup of LameXP.<br>
 <br>
 <br>
+QAAC Encoder<br>
+<br>
+Optionally LameXP supports the QAAC encoder, i.e. the AAC encoder used by QuickTime and iTunes. Just like the<br>
+Nero AAC encoder, the QAAC encoder can NOT be redistributed along with LameXP. Thus if you want to use the<br>
+QAAC encoder, then you have to install QuickTime v7.7.1 (or newer). Alternatively iTunes v10.5 (or newer) can<br>
+be installed. Both, QuickTime and iTunes, can be <a href="http://www.apple.com/quicktime/download/" target="_blank">downloaded for free</a> from the official Apple web-site.<br>
+<br>
+In order to enable the QAAC Encoder support you will also need the 'QAAC Encoder Add-in' for LameXP:<br><ul>
+<li><a href="http://www.mediafire.com/file/uayr4fbbohx9544/LameXP.qaac-addin.2012-03-06.zip" target="_blank">http://www.mediafire.com/file/uayr4fbbohx9544/LameXP.qaac-addin.2012-03-06.zip</a>
+<li><a href="http://mulder.brhack.net/public/add-in/LameXP.qaac-addin.2012-03-06.zip" target="_blank">http://mulder.brhack.net/public/add-in/LameXP.qaac-addin.2012-03-06.zip</a></ul>
+<br>
+Please follow the install instructions that are included with the 'QAAC Encoder Add-in' download package!<br>
+Note that you do NOT need to install this Add-in, if you only want to use the Nero AAC Encoder.<br>
+<br>
+<br>
+FHG AAC Encoder<br>
+<br>
 Optionally LameXP also supports the FHG AAC Encoder now. Just like the Nero encoder, the FHG encoder can NOT<br>
 be redistributed along with LameXP. However the FHG AAC Encoder is included with Winamp v5.62, which is<br>
 available as a free download (you don't need to buy the "Pro" version!) from the official Winamp web-site at:<br><ul>
 <li><a href="http://www.winamp.com/media-player/" target="_blank">http://www.winamp.com/media-player/</a>
-<li><a href="http://download.nullsoft.com/winamp/client/winamp5621_full_emusic-7plus_all.exe" target="_blank">http://download.nullsoft.com/winamp/client/winamp5621_full_emusic-7plus_all.exe</a></ul>
+<li><a href="http://download.nullsoft.com/winamp/client/winamp5623_full_emusic-7plus_all.exe" target="_blank">http://download.nullsoft.com/winamp/client/winamp5623_full_emusic-7plus_all.exe</a></ul>
 <br>
 In order to enable the FHG AAC Encoder support you will also need the 'FHG AAC Encoder Add-in' for LameXP:<br><ul>
-<li><a href="http://www.megaupload.com/?d=GKY3RGPS" target="_blank">http://www.megaupload.com/?d=GKY3RGPS</a>
-<li><a href="http://www.rapidshare.com/files/1807225271/LameXP.fhgaacenc-addin.2011-08-22.zip" target="_blank">http://www.rapidshare.com/files/1807225271/LameXP.fhgaacenc-addin.2011-08-22.zip</a>
-<li><a href="http://www.mediafire.com/?pir8my4belb5krl" target="_blank">http://www.mediafire.com/?pir8my4belb5krl</a>
-<li><a href="http://www.zshare.net/download/93978586842938e6/" target="_blank">http://www.zshare.net/download/93978586842938e6/</a>
-<li><a href="http://www.gamefront.com/files/20703766/LameXP.fhgaacenc-addin.2011-08-22.zip" target="_blank">http://www.gamefront.com/files/20703766/LameXP.fhgaacenc-addin.2011-08-22.zip</a>
-<li><a href="http://www.easy-share.com/1917653443/LameXP.fhgaacenc-addin.2011-08-22.zip" target="_blank">http://www.easy-share.com/1917653443/LameXP.fhgaacenc-addin.2011-08-22.zip</a>
-<li><a href="http://uploaded.to/file/0h0c7qf6" target="_blank">http://uploaded.to/file/0h0c7qf6</a></ul>
+<li><a href="http://www.mediafire.com/file/on0m45l7z26fmch/LameXP.fhgaacenc-addin.2011-08-22.zip" target="_blank">http://www.mediafire.com/file/on0m45l7z26fmch/LameXP.fhgaacenc-addin.2011-08-22.zip</a>
+<li><a href="http://mulder.brhack.net/public/add-in/LameXP.fhgaacenc-addin.2011-08-22.zip" target="_blank">http://mulder.brhack.net/public/add-in/LameXP.fhgaacenc-addin.2011-08-22.zip</a></ul>
 <br>
 Please follow the install instructions that are included with the 'FHG AAC Encoder Add-in' download package!<br>
-Note that you do NOT need to install the Add-in, if you only want to use the Nero AAC Encoder.<br>
-<br>
-<br>
-As a third option, LameXP supports the QAAC encoder, i.e. the AAC encoder of QuickTime/iTunes. Just like the<br>
-other two AAC encoders, the QAAC encoder can NOT be redistributed along with LameXP. Thus if you want to use<br>
-the QAAC encoder, then you have to install QuickTime v7.7.1 (or newer). Alternatively iTunes v10.5 (or newer)<br>
-can be installed. Both, QuickTime and iTunes, can be <a href="http://www.apple.com/quicktime/download/" target="_blank">downloaded for free</a> from the official Apple web-site.<br>
-<br>
-In addition to installing QuickTime/iTunes, you must download the QAAC encoder from <a href="http://sites.google.com/site/qaacpage/" target="_blank">this</a> web-site. Then put<br>
-'qaac.exe' and 'libsoxrate.dll' as well as 'msvcr100.dll' and 'msvcp100.dll' into the same directory where<br>
-your LameXP executable ('LameXP.exe') is located. QAAC will then be "enabled" on the next startup of LameXP.<br><br>
+Note that you do NOT need to install this Add-in, if you only want to use the Nero AAC Encoder.<br><br>
 
 <br><br>
 

diff --git a/src/Config.h b/src/Config.h
index 9805c84..034860c 100644 (file)
--- a/src/Config.h
+++ b/src/Config.h
@@ -29,8 +29,8 @@
 #define VER_LAMEXP_MINOR_HI                                    0
 #define VER_LAMEXP_MINOR_LO                                    4
 #define VER_LAMEXP_TYPE                                                Beta
-#define VER_LAMEXP_PATCH                                       4
-#define VER_LAMEXP_BUILD                                       899
+#define VER_LAMEXP_PATCH                                       5
+#define VER_LAMEXP_BUILD                                       900
 
 ///////////////////////////////////////////////////////////////////////////////
 // Tool versions (minimum expected versions!)
@@ -38,7 +38,7 @@
 
 #define VER_LAMEXP_TOOL_NEROAAC                                1540
 #define VER_LAMEXP_TOOL_FHGAACENC                      20110822
-#define VER_LAMEXP_TOOL_QAAC                           105
+#define VER_LAMEXP_TOOL_QAAC                           131
 #define VER_LAMEXP_TOOL_COREAUDIO                      7710
 
 ///////////////////////////////////////////////////////////////////////////////