diff options
| author | piratfm <piratfm@gmail.com> | 2013-04-12 00:26:09 +0300 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2013-12-14 17:42:30 +0100 |
| commit | ddb94b9025f6893a6d9543254fedf0a70c0549b8 (patch) | |
| tree | c53927550c4bba4c2b6e4dbec60d183f70982fcb /libAACenc/src/psy_main.cpp | |
| parent | 671667db206f8551c21c085158d2f949a93536e6 (diff) | |
| download | ODR-AudioEnc-ddb94b9025f6893a6d9543254fedf0a70c0549b8.tar.gz ODR-AudioEnc-ddb94b9025f6893a6d9543254fedf0a70c0549b8.tar.bz2 ODR-AudioEnc-ddb94b9025f6893a6d9543254fedf0a70c0549b8.zip | |
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
Diffstat (limited to 'libAACenc/src/psy_main.cpp')
| -rw-r--r-- | libAACenc/src/psy_main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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]) |