From 91860b89488b3ee4644c539e89e657fbb79fb6ad Mon Sep 17 00:00:00 2001 From: Wei Jia Date: Mon, 17 Aug 2015 20:13:17 -0700 Subject: SoftAVCEncoder: fix auto merge error, member names have changed. Bug: 20674674 Change-Id: I511c22d59789e1cc3a21fe13ea08ac3752e737c6 --- media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '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 0f56f4c..6a7b222 100644 --- a/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp +++ b/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp @@ -244,7 +244,7 @@ OMX_ERRORTYPE SoftAVCEncoder::initEncParams() { if (mColorFormat != OMX_COLOR_FormatYUV420Planar || mInputDataIsMeta) { // Color conversion is needed. free(mInputFrameData); - if (((uint64_t)mVideoWidth * mVideoHeight) > ((uint64_t)INT32_MAX / 3)) { + if (((uint64_t)mWidth * mHeight) > ((uint64_t)INT32_MAX / 3)) { ALOGE("Buffer size is too big."); return OMX_ErrorUndefined; } -- cgit v1.1