diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-05-10 07:21:32 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-05-10 07:21:32 +0000 |
| commit | e30420c551a348fdf0a20888ca2b95b527060061 (patch) | |
| tree | 756d84f186478676d172f1afc3339c05c6b69709 /libSBRdec/src/psbitdec.cpp | |
| parent | 2fd44f2027f15c5e141f05245819bf424a44cfa1 (diff) | |
| parent | 44ac411683e7cfbfdb1f58e02d54377d709c8dd4 (diff) | |
| download | fdk-aac-e30420c551a348fdf0a20888ca2b95b527060061.tar.gz fdk-aac-e30420c551a348fdf0a20888ca2b95b527060061.tar.bz2 fdk-aac-e30420c551a348fdf0a20888ca2b95b527060061.zip | |
Snap for 4773106 from 44ac411683e7cfbfdb1f58e02d54377d709c8dd4 to pi-release
Change-Id: I5a98f52a42445a8a9cbd9e582612a57d1e277f5d
Diffstat (limited to 'libSBRdec/src/psbitdec.cpp')
| -rw-r--r-- | libSBRdec/src/psbitdec.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libSBRdec/src/psbitdec.cpp b/libSBRdec/src/psbitdec.cpp index b2ea2e9..1521178 100644 --- a/libSBRdec/src/psbitdec.cpp +++ b/libSBRdec/src/psbitdec.cpp @@ -496,7 +496,7 @@ unsigned int ReadPsData( /* no useful PS data could be read from bitstream */ h_ps_d->bPsDataAvail[h_ps_d->bsReadSlot] = ppt_none; /* discard all remaining bits */ - nBitsLeft -= startbits - FDKgetValidBits(hBitBuf); + nBitsLeft -= startbits - (INT)FDKgetValidBits(hBitBuf); while (nBitsLeft > 0) { int i = nBitsLeft; if (i > 8) { @@ -505,7 +505,7 @@ unsigned int ReadPsData( FDKreadBits(hBitBuf, i); nBitsLeft -= i; } - return (startbits - FDKgetValidBits(hBitBuf)); + return (UINT)(startbits - (INT)FDKgetValidBits(hBitBuf)); } if (pBsData->modeIid > 2) { |