Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'aosp/jb-mr1-release' into master | Martin Storsjo | 2012-11-01 | 1 | -13/+4 |
| | | | | | | | Conflicts: libAACenc/src/band_nrg.cpp libAACenc/src/grp_data.cpp libSBRenc/src/env_est.cpp | ||||
* | Add an _enc suffix to the sbr_ram/rom files in libSBRenc | Martin Storsjo | 2012-07-11 | 1 | -0/+740 |
This avoids name clashes with the similarly named files in libSBRdec, when building all libraries with one single automake file. |