From ddb94b9025f6893a6d9543254fedf0a70c0549b8 Mon Sep 17 00:00:00 2001 From: piratfm Date: Fri, 12 Apr 2013 00:26:09 +0300 Subject: vlc works with bare aac Conflicts: .cproject libAACenc/src/aacenc_lib.cpp libAACenc/src/qc_main.cpp libFDK/src/FDK_crc.cpp libSYS/include/FDK_audio.h --- libAACenc/src/psy_main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libAACenc/src/psy_main.cpp') diff --git a/libAACenc/src/psy_main.cpp b/libAACenc/src/psy_main.cpp index 59193c7..a544b1b 100644 --- a/libAACenc/src/psy_main.cpp +++ b/libAACenc/src/psy_main.cpp @@ -815,7 +815,7 @@ AAC_ENCODER_ERROR FDKaacEnc_psyMain(INT channels, &hThisPsyConf[1]->tnsConf); } - FDK_ASSERT(commonWindow=1); /* all checks for TNS do only work for common windows (which is always set)*/ + FDK_ASSERT(commonWindow==1); /* all checks for TNS do only work for common windows (which is always set)*/ for(w = 0; w < nWindows[0]; w++) { if (isShortWindow[0]) -- cgit v1.2.3