diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2016-09-09 22:18:35 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-09-09 22:18:35 +0000 |
| commit | ca6ae4ffe4c5b38b4a3619dec4a51c60257e77ef (patch) | |
| tree | e49a84688a0d329fef067b864f07dce58f1e4f96 | |
| parent | fb66dceae5e856648073138305ea59cc4eabf26e (diff) | |
| parent | 79c3cd8b1aa96bece2b262f65b0d25f398297ff9 (diff) | |
| download | fdk-aac-ca6ae4ffe4c5b38b4a3619dec4a51c60257e77ef.tar.gz fdk-aac-ca6ae4ffe4c5b38b4a3619dec4a51c60257e77ef.tar.bz2 fdk-aac-ca6ae4ffe4c5b38b4a3619dec4a51c60257e77ef.zip | |
Merge "Avoid a warning about extra parentheses" am: f935254cc9 am: 899335d310
am: 79c3cd8b1a
Change-Id: Ia7a3b896268f11c5c2003c36aa38724910b08db0
| -rw-r--r-- | libSBRenc/src/sbr_encoder.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libSBRenc/src/sbr_encoder.cpp b/libSBRenc/src/sbr_encoder.cpp index 86a3f91..71aab78 100644 --- a/libSBRenc/src/sbr_encoder.cpp +++ b/libSBRenc/src/sbr_encoder.cpp @@ -1939,7 +1939,7 @@ INT sbrEncoder_Init( - if ( (aot==AOT_PS) ) { + if ( aot==AOT_PS ) { usePs = 1; } if ( aot==AOT_ER_AAC_ELD ) { |