Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e264b770 authored by Wei Jia's avatar Wei Jia Committed by Android Git Automerger
Browse files

am d9d6c465: am 5d1e62e2: am 9cebcc5f: Merge "SoftAVCEncoder: fix mismatched... 

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

* commit 'd9d6c465':
  SoftAVCEncoder: fix mismatched type for comparison.
parents 2cb6f18d d9d6c465

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

+1 −1
Original line number Diff line number Diff line
@@ -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;

    }