diff --git a/doc/Changelog.html b/doc/Changelog.html
index 2e7c5301..0d3f6f37 100644
--- a/doc/Changelog.html
+++ b/doc/Changelog.html
@@ -14,7 +14,8 @@
Updated LAME encoder to v3.99.0.14 (2011-02-28), compiled with ICL 12.0.2
Updated Vorbis encoder to v2.87 using aoTuV Beta-6.02 (2011-02-28), compiled with ICL 11.1 and MSVC 9.0
Updated MediaInfo to v0.7.42 (2011-03-03), compiled with ICL 12.0.2 and MSVC 9.0
-Updated language files (big "thank you" to all contributors !!!)
+Updated language files (big thank-you to all contributors !!!)
+Fixed a bug that caused AAC encoding to fail in CBR mode (the "-2pass" parameter was set wrongly)
Changes between v3.18 and v4.00:
@@ -36,7 +37,7 @@
- Updated MediaInfo to v0.7.41 (2011-01-24), compiled with ICL 11.1.065
- Updated SoX to v14.3.1 (2010-04-11), compiled with MSVC 9.0
- Updated GnuPG to v1.4.11, compiled with GCC 4.5.2
-
- Updated language files (big "thank you" to all contributors !!!)
+
- Updated language files (big thank-you to all contributors !!!)
- Removed TAK support for now, as their CloseSource(!) tools don't support Unicode file names yet
- Removed Volumax tool, as we are using SoX for normalization from now on
- Countless minor fixes and improvements (hopefully not too many regressions ^^)
@@ -45,7 +46,7 @@
Changes between v3.18 and v3.19:
- Updated MediaInfo to v0.7.34 (2010-07-09), compiled with ICL 11.1.065
- Updated mpg123 decoder to v1.12.3 (2010-07-11), compiled with GCC 4.6.0
-
- Updated language files (big "thank you" to all contributors !!!)
+
- Updated language files (big thank-you to all contributors !!!)
- Fixed decoding of certain invalid WavPack files
@@ -56,7 +57,7 @@
- Updated MediaInfo to v0.7.32 (2010-05-02), compiled with ICL 11.1.065
- Updated mpg123 decoder to v1.12.1 (2010-03-31), compiled with GCC 4.4.4
- Updated Ogg Vorbis decoder to v1.9.7 (2010-03-29), compiled with MSVC 9.0
-
- Updated language files (big "thank you" to all contributors !!!)
+
- Updated language files (big thank-you to all contributors !!!)
Changes between v3.16 and v3.17:
@@ -89,7 +90,7 @@
- Updated mpg123 decoder to v1.9.2 (2009-11-20)
- Updated MediaInfo to v0.7.25 (2009-11-13), compiled with ICL 11.1.046
- Updated AC3Filter Tools to v0.31b (2009-10-01), compiled with ICL 11.1.046
-
- Updated language files (big "thank you" to all contributors !!!)
+
- Updated language files (big thank-you to all contributors !!!)
- Updated JEDI-VCL from v3.38 to v3.39 (2009-11-05)
- Various minor fixes and improvements
@@ -101,7 +102,7 @@
Updated AC3Filter Tools to v0.31b (2009-10-01)
Updated TAK decoder to v1.1.2 (2009-07-27)
Updated mpg123 decoder to v1.9.1 (2009-10-09)
-Updated language files (big "thank you" to all contributors !!!)
+Updated language files (big thank-you to all contributors !!!)
Updated the Splash screen and modified the sound that plays on very first launch
Updated JEDI-VCL from v3.34 to v3.38 (2009-08-27)
Updated GnuPG to v1.4.10 (2009-09-02)
@@ -125,7 +126,7 @@
Changes between v3.10 and v3.11:
- Added options to sort the source files (by title, by filename or by track number)
-
- Updated language files (big "thank you" to all contributors !!!)
+
- Updated language files (big thank-you to all contributors !!!)
- Updated mpg123 decoder to v1.8.1 (2009-06-14)
- Updated FLAC decoder, now using the ICL 9.1 build of FLAC v1.2.1b
- Updated MediaInfo to v0.7.17 (statically linked)
@@ -137,7 +138,7 @@
- Added a NSIS-based installer (will be released in addition to the ZIP package)
- Added support for the TAK lossless audio format
- Added two new languages: Serbian (Latin) and Ukrainian
-
- Updated language files (big "thank you" to all contributors !!!)
+
- Updated language files (big thank-you to all contributors !!!)
- Updated MediaInfo to a custom build of v0.7.16 that is statically linked (and removed the DLL)
- Updated mpg123 decoder to v1.8.0 RC-3 (2009-06-03)
- Updated Musepack decoder to v1.0.0 (2009-04-02) and fixed Musepack VS8 support
@@ -166,7 +167,7 @@
- Updated Ogg Vorbis encoder to v2.85, libvorbis v1.2.1 RC2, aoTuV b5.61 (2008-12-24)
- Updated mpg123 decoder to v1.6.3 (2008-12-20)
- Updated MediaInfo to v0.7.8.0 (2008-12-10)
-
- Updated language files (big "thank you" to all contributors !!!)
+
- Updated language files (big thank-you to all contributors !!!)
Changes between v3.05 and v3.06:
@@ -175,7 +176,7 @@
- Added support for the ALAC audio format
- Updated MediaInfo to v0.7.7.7 (2008-10-17)
- Updated AC3 Filter Tools to v0.2a (2008-06-30)
-
- Updated language files (big "thank you" to all contributors !!!)
+
- Updated language files (big thank-you to all contributors !!!)
- Fixed and improved "Normalization" filter
- Fixed a few minor bugs
@@ -185,7 +186,7 @@
Added option to add an entire directory or an entire directory-tree
Added new languages: Russian, Nederlands, Greek and Hungarian
Added Dropbox for improved Drag&Drop support
-Updated language files (big "thank you" to all contributors !!!)
+Updated language files (big thank-you to all contributors !!!)
Updated LAME encoder to v3.98.2 Final (2008-09-24)
Updated MediaInfo to v0.7.7.6 (2008-09-12)
diff --git a/src/Config.h b/src/Config.h
index a7e804d9..30ce2205 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -25,8 +25,8 @@
#define VER_LAMEXP_MAJOR 4
#define VER_LAMEXP_MINOR_HI 0
#define VER_LAMEXP_MINOR_LO 1
-#define VER_LAMEXP_BUILD 358
-#define VER_LAMEXP_SUFFIX Beta-6
+#define VER_LAMEXP_BUILD 360
+#define VER_LAMEXP_SUFFIX Beta-8
/*
* Tools versions
diff --git a/src/Encoder_AAC.cpp b/src/Encoder_AAC.cpp
index 86b12eb1..ac12194e 100644
--- a/src/Encoder_AAC.cpp
+++ b/src/Encoder_AAC.cpp
@@ -63,7 +63,7 @@ bool AACEncoder::encode(const QString &sourceFile, const AudioFileModel &metaInf
args << "-br" << QString::number(max(32, min(500, (m_configBitrate * 8))) * 1000);
break;
case SettingsModel::CBRMode:
- args << "-cbr" << QString::number(max(32, min(500, (m_configBitrate * 8))) * 1000) << "-2pass";
+ args << "-cbr" << QString::number(max(32, min(500, (m_configBitrate * 8))) * 1000);
break;
default:
throw "Bad rate-control mode!";