am 9cebcc5f: Merge "SoftAVCEncoder: fix mismatched type for comparison." into lmp-dev (5d1e62e2) · Commits · e / os / android_frameworks_av

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -259,7 +259,7 @@ OMX_ERRORTYPE SoftAVCEncoder::initEncParams() {
	int32_t nMacroBlocks = ((((mVideoWidth + 15) >> 4) << 4) *		int32_t nMacroBlocks = ((((mVideoWidth + 15) >> 4) << 4) *
	(((mVideoHeight + 15) >> 4) << 4)) >> 8;		(((mVideoHeight + 15) >> 4) << 4)) >> 8;
	CHECK(mSliceGroup == NULL);		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.");		ALOGE("requested memory size is too big.");
	return OMX_ErrorUndefined;		return OMX_ErrorUndefined;
	}		}