diff options
| author | Wei Jia <wjia@google.com> | 2015-08-17 19:07:48 -0700 |
|---|---|---|
| committer | Wei Jia <wjia@google.com> | 2015-08-17 19:07:48 -0700 |
| commit | 38eff9af5c032bf12f89d6e94df05f65eef51afc (patch) | |
| tree | 5058913011bb9d70ba2f4d417c5b6d1753cd569b | |
| parent | 90eee3397ad45bdae462f9f2ce0ef7d3b1e2957d (diff) | |
| download | frameworks_av-38eff9af5c032bf12f89d6e94df05f65eef51afc.zip frameworks_av-38eff9af5c032bf12f89d6e94df05f65eef51afc.tar.gz frameworks_av-38eff9af5c032bf12f89d6e94df05f65eef51afc.tar.bz2 | |
SoftAVCEncoder: fix mismatched type for comparison.
Bug: 20674674
Change-Id: Iace5b8c882339b3a9d2e706375255aeeeb0532fe
| -rw-r--r-- | media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp b/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp index 523e785..e3fdc89 100644 --- a/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp +++ b/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp @@ -259,7 +259,7 @@ OMX_ERRORTYPE SoftAVCEncoder::initEncParams() { int32_t nMacroBlocks = ((((mVideoWidth + 15) >> 4) << 4) * (((mVideoHeight + 15) >> 4) << 4)) >> 8; CHECK(mSliceGroup == NULL); - if (nMacroBlocks > SIZE_MAX / sizeof(uint32_t)) { + if ((size_t)nMacroBlocks > SIZE_MAX / sizeof(uint32_t)) { ALOGE("requested memory size is too big."); return OMX_ErrorUndefined; } |