commit | 3db5231c9fb7ee2a6bfb18eabaccc35df4b5f0a2 | [log] [tgz] |
---|---|---|
author | Wei Jia <wjia@google.com> | Mon Aug 17 20:13:17 2015 -0700 |
committer | The Android Automerger <android-build@android.com> | Tue Sep 01 19:20:02 2015 -0700 |
tree | 4fbec11f9597481dd180ad08df44306e736e509f | |
parent | 0071d87e243d5f1612dc1e31b4caa1fe191fea90 [diff] |
SoftAVCEncoder: fix auto merge error, member names have changed. Bug: 20674674 Change-Id: I511c22d59789e1cc3a21fe13ea08ac3752e737c6
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 @@ 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; }