diff options
| author | Wei Jia <wjia@google.com> | 2015-08-18 02:41:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-18 02:41:07 +0000 |
| commit | d9d6c465d94f64e3705f234fa3f53e0341bc2b41 (patch) | |
| tree | 3c01510e1f664a75d6c873a087c5bdd309151ef9 /media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp | |
| parent | c7bf75c3913abf79db6ac46ab9eeaff0c55e74c4 (diff) | |
| parent | 5d1e62e24628e86fc0485113db18b31973a5cf4b (diff) | |
| download | frameworks_av-d9d6c465d94f64e3705f234fa3f53e0341bc2b41.zip frameworks_av-d9d6c465d94f64e3705f234fa3f53e0341bc2b41.tar.gz frameworks_av-d9d6c465d94f64e3705f234fa3f53e0341bc2b41.tar.bz2 | |
am 5d1e62e2: am 9cebcc5f: Merge "SoftAVCEncoder: fix mismatched type for comparison." into lmp-dev
* commit '5d1e62e24628e86fc0485113db18b31973a5cf4b':
SoftAVCEncoder: fix mismatched type for comparison.
Diffstat (limited to 'media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp')
| -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 7add08f..0f56f4c 100644 --- a/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp +++ b/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp @@ -268,7 +268,7 @@ OMX_ERRORTYPE SoftAVCEncoder::initEncParams() { int32_t nMacroBlocks = divUp(mWidth, 16) * divUp(mHeight, 16); 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; } |