diff --git a/doc/Changelog.html b/doc/Changelog.html index 7a3452f6..7d250d95 100644 --- a/doc/Changelog.html +++ b/doc/Changelog.html @@ -89,6 +89,7 @@
  • The "Algorithm Quality" slider now also effects the QAAC encoder
  • Updated MediaInfo to v0.7.82 (2016-01-27), compiled with ICL 15.0 and MSVC 12.0
  • Updated QAAC add-in to the to QAAC v2.58 (2016-01-05)
  • +
  • Updated FhgAacEnc add-in to "Case" edition (2015-10-24)
  • Updated ALAC decoder to refalac v1.58 (2016-01-05)
  • LameXP v4.13 [2015-12-12]

    diff --git a/doc/Changelog.md b/doc/Changelog.md index 29d1e5d4..b565193e 100644 --- a/doc/Changelog.md +++ b/doc/Changelog.md @@ -9,6 +9,7 @@ * The "Algorithm Quality" slider now also effects the QAAC encoder * Updated MediaInfo to v0.7.82 (2016-01-27), compiled with ICL 15.0 and MSVC 12.0 * Updated QAAC add-in to the to QAAC v2.58 (2016-01-05) +* Updated FhgAacEnc add-in to "Case" edition (2015-10-24) * Updated ALAC decoder to refalac v1.58 (2016-01-05) diff --git a/src/Config.h b/src/Config.h index 13681ed7..f2a9bc1c 100644 --- a/src/Config.h +++ b/src/Config.h @@ -34,8 +34,8 @@ #define VER_LAMEXP_MINOR_HI 1 #define VER_LAMEXP_MINOR_LO 4 #define VER_LAMEXP_TYPE Alpha -#define VER_LAMEXP_PATCH 2 -#define VER_LAMEXP_BUILD 1862 +#define VER_LAMEXP_PATCH 3 +#define VER_LAMEXP_BUILD 1864 #define VER_LAMEXP_CONFG 1818 /////////////////////////////////////////////////////////////////////////////// @@ -50,7 +50,7 @@ /////////////////////////////////////////////////////////////////////////////// #define VER_LAMEXP_TOOL_NEROAAC 1540 -#define VER_LAMEXP_TOOL_FHGAACENC 20120806 +#define VER_LAMEXP_TOOL_FHGAACENC 20151024 #define VER_LAMEXP_TOOL_FDKAACENC 62 #define VER_LAMEXP_TOOL_QAAC 258 diff --git a/src/Thread_Initialization.cpp b/src/Thread_Initialization.cpp index 2f34f44f..0a92b72b 100644 --- a/src/Thread_Initialization.cpp +++ b/src/Thread_Initialization.cpp @@ -695,7 +695,7 @@ void InitAacEncTask::initAacEncImpl(const char *const toolName, const char *cons toolVersion = 0; for(quint32 i = 0; i < verDigits; i++) { - toolVersion = (toolVersion * verShift) + qBound(0U, tmp[i], (verShift - 1)); + toolVersion = (verShift > 0) ? ((toolVersion * verShift) + qBound(0U, tmp[i], (verShift - 1))) : tmp[i]; } } } diff --git a/src/Tools.h b/src/Tools.h index 738b1f46..da72a792 100644 --- a/src/Tools.h +++ b/src/Tools.h @@ -119,11 +119,10 @@ aac_encoder_t; static const aac_encoder_t g_lamexp_aacenc[] = { - { "NeroAAC", { "neroAacEnc.exe", "neroAacDec.exe", "neroAacTag.exe", NULL }, "-help", lamexp_toolver_neroaac(), 4, 10, "v?.?.?.?", "Package\\s+version:\\s+(\\d)\\.(\\d)\\.(\\d)\\.(\\d)", "Nero\\s+AAC\\s+Encoder" }, - { "FhgAacEnc", { "fhgaacenc.exe", "enc_fhgaac.dll", "nsutil.dll", "libmp4v2.dll", "libsndfile-1.dll", NULL }, NULL, lamexp_toolver_fhgaacenc(), 1, 100000000, "????-??-??", "fhgaacenc version (\\d+) by tmkk", NULL }, - { "FdkAacEnc", { "fdkaac.exe", NULL }, "--help", lamexp_toolver_fdkaacenc(), 3, 10, "v?.?.?", "fdkaac\\s+(\\d)\\.(\\d)\\.(\\d)", NULL }, - { "QAAC", { "qaac.exe", "libsoxr.dll", "libsoxconvolver.dll", NULL }, "--check", lamexp_toolver_qaacenc(), 2, 100, "v?.??", "qaac (\\d)\\.(\\d+)", NULL }, - { "QAACx64", { "qaac64.exe", "libsoxr64.dll", "libsoxconvolver64.dll", NULL }, "--check", lamexp_toolver_qaacenc(), 2, 100, "v?.??", "qaac (\\d)\\.(\\d+)", NULL }, + { "NeroAAC", { "neroAacEnc.exe", "neroAacDec.exe", "neroAacTag.exe", NULL }, "-help", lamexp_toolver_neroaac(), 4, 10, "v?.?.?.?", "Package\\s+version:\\s+(\\d)\\.(\\d)\\.(\\d)\\.(\\d)", "Nero\\s+AAC\\s+Encoder" }, + { "FhgAacEnc", { "fhgaacenc.exe", "enc_fhgaac.dll", "nsutil.dll", "libmp4v2.dll", NULL }, NULL, lamexp_toolver_fhgaacenc(), 2, 0, "????-??-??", "fhgaacenc version (\\d+) by tmkk. Modified by Case (\\d+).", NULL }, + { "FdkAacEnc", { "fdkaac.exe", NULL }, "--help", lamexp_toolver_fdkaacenc(), 3, 10, "v?.?.?", "fdkaac\\s+(\\d)\\.(\\d)\\.(\\d)", NULL }, + { "QAAC", { "qaac.exe", "libsoxr.dll", "libsoxconvolver.dll", NULL }, "--check", lamexp_toolver_qaacenc(), 2, 100, "v?.??", "qaac (\\d)\\.(\\d+)", NULL }, + { "QAACx64", { "qaac64.exe", "libsoxr64.dll", "libsoxconvolver64.dll", NULL }, "--check", lamexp_toolver_qaacenc(), 2, 100, "v?.??", "qaac (\\d)\\.(\\d+)", NULL }, { NULL, { NULL }, NULL, 0, 0, 0, NULL, NULL, NULL } }; -