From 3f40f1ed66672b37a204ee1fbec1f2653a0df96a Mon Sep 17 00:00:00 2001 From: lordmulder Date: Wed, 9 Mar 2011 17:40:26 +0100 Subject: [PATCH] Fix AAC encoding in CBR mode: Don't set the "-2pass" parameter when CBR mode is used, as this will cause the Nero AAC encoder to abort with error. --- doc/Changelog.html | 23 ++++++++++++----------- src/Config.h | 4 ++-- src/Encoder_AAC.cpp | 2 +- 3 files changed, 15 insertions(+), 14 deletions(-) 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:

    Changes between v3.16 and v3.17:

    @@ -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:

    Changes between v3.05 and v3.06:

    @@ -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!";