commit 5d1e62e24628e86fc0485113db18b31973a5cf4b
author Wei Jia <wjia@google.com> Tue Aug 18 02:33:01 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 18 02:33:01 2015 +0000
tree d76c9e840a384974039b625eaffceb5892bfd22c
parent 138f44a1de740fb6b3a3491c30a11dc8f6ca5f81
parent 9cebcc5f7992ded7fa686575914830b6554cd6c9

am 9cebcc5f: Merge "SoftAVCEncoder: fix mismatched type for comparison." into lmp-dev

* commit '9cebcc5f7992ded7fa686575914830b6554cd6c9':
  SoftAVCEncoder: fix mismatched type for comparison.

media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp

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 @@
     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;
     }