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

Commit c275e2d7 authored by Marco Nelissen's avatar Marco Nelissen Committed by Android Git Automerger
Browse files

am b3d9f563: Reconcile with master after mass cherrypicks 

* commit 'b3d9f563':
  Reconcile with master after mass cherrypicks
parents 04e6b8c1 b3d9f563

media/libstagefright/codecs/avcenc/SoftAVCEnc.cpp

+1 −0
Original line number Diff line number Diff line
@@ -637,6 +637,7 @@ OMX_ERRORTYPE SoftAVC::initEncoder() { 
        for (size_t i = 0; i < MAX_CONVERSION_BUFFERS; i++) {

            if (mConversionBuffers[i] != NULL) {

                free(mConversionBuffers[i]);

                mConversionBuffers[i] = 0;

            }



            if (((uint64_t)mStride * mHeight) > ((uint64_t)INT32_MAX / 3)) {