Merge remote-tracking branch 'aosp/master'

This commit is contained in:
Martin Storsjo 2016-09-10 14:38:15 +03:00
commit 5eb3c9be88
1 changed files with 1 additions and 1 deletions

View File

@ -1939,7 +1939,7 @@ INT sbrEncoder_Init(
if ( (aot==AOT_PS) ) { if ( aot==AOT_PS ) {
usePs = 1; usePs = 1;
} }
if ( aot==AOT_ER_AAC_ELD ) { if ( aot==AOT_ER_AAC_ELD ) {