diff options
| author | Glenn Kasten <gkasten@google.com> | 2016-04-20 23:40:28 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-20 23:40:28 +0000 |
| commit | 18a9bb8b6d6bebae0cf3bdb404a2f8c417cd17fc (patch) | |
| tree | 54f00c5c12777852b7dc3a7999e49e3c4bf5fc78 /libSBRenc | |
| parent | 268c63c4a5c0152e35a76d1f18a9a80978e7b7c4 (diff) | |
| parent | 28099687b733eac90cff9273b6f8f660176e0784 (diff) | |
| download | fdk-aac-18a9bb8b6d6bebae0cf3bdb404a2f8c417cd17fc.tar.gz fdk-aac-18a9bb8b6d6bebae0cf3bdb404a2f8c417cd17fc.tar.bz2 fdk-aac-18a9bb8b6d6bebae0cf3bdb404a2f8c417cd17fc.zip | |
resolve merge conflicts of ad1e898 to nyc-dev-plus-aosp
am: 2809968
* commit '28099687b733eac90cff9273b6f8f660176e0784':
Remove redundant parentheses around == comparison operator
Change-Id: I87566357ee932ac57eed79645fec146625c85cdb
Diffstat (limited to 'libSBRenc')
| -rw-r--r-- | libSBRenc/src/sbr_encoder.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libSBRenc/src/sbr_encoder.cpp b/libSBRenc/src/sbr_encoder.cpp index 90b19cf..86a3f91 100644 --- a/libSBRenc/src/sbr_encoder.cpp +++ b/libSBRenc/src/sbr_encoder.cpp @@ -1942,10 +1942,10 @@ INT sbrEncoder_Init( if ( (aot==AOT_PS) ) { usePs = 1; } - if ( (aot==AOT_ER_AAC_ELD) ) { + if ( aot==AOT_ER_AAC_ELD ) { lowDelay = 1; } - else if ( (aot==AOT_ER_AAC_LD) ) { + else if ( aot==AOT_ER_AAC_LD ) { error = 1; goto bail; } |