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 /libAACdec/src/rvlcconceal.cpp | |
| 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 'libAACdec/src/rvlcconceal.cpp')
| -rw-r--r-- | libAACdec/src/rvlcconceal.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libAACdec/src/rvlcconceal.cpp b/libAACdec/src/rvlcconceal.cpp index ae6b4da..cf33dd5 100644 --- a/libAACdec/src/rvlcconceal.cpp +++ b/libAACdec/src/rvlcconceal.cpp @@ -459,7 +459,7 @@ void BidirectionalEstimation_UseScfOfPrevFrameAsReference ( break; case NOISE_HCB: - if ( (pAacDecoderStaticChannelInfo->concealmentInfo.aRvlcPreviousCodebook[bnds]==NOISE_HCB) ) { + if ( pAacDecoderStaticChannelInfo->concealmentInfo.aRvlcPreviousCodebook[bnds]==NOISE_HCB ) { commonMin = FDKmin(pAacDecoderChannelInfo->pComData->overlay.aac.aRvlcScfFwd[bnds],pAacDecoderChannelInfo->pComData->overlay.aac.aRvlcScfBwd[bnds]); pAacDecoderChannelInfo->pDynData->aScaleFactor[bnds] = FDKmin(commonMin, pAacDecoderStaticChannelInfo->concealmentInfo.aRvlcPreviousScaleFactor[bnds]); } else { @@ -669,7 +669,7 @@ void PredictiveInterpolation ( break; case NOISE_HCB: - if ( (pAacDecoderStaticChannelInfo->concealmentInfo.aRvlcPreviousCodebook[bnds]==NOISE_HCB) ) { + if ( pAacDecoderStaticChannelInfo->concealmentInfo.aRvlcPreviousCodebook[bnds]==NOISE_HCB ) { commonMin = FDKmin(pAacDecoderChannelInfo->pComData->overlay.aac.aRvlcScfFwd[bnds],pAacDecoderChannelInfo->pComData->overlay.aac.aRvlcScfBwd[bnds]); pAacDecoderChannelInfo->pDynData->aScaleFactor[bnds] = FDKmin(commonMin, pAacDecoderStaticChannelInfo->concealmentInfo.aRvlcPreviousScaleFactor[bnds]); } |