diff options
| author | Wei Jia <wjia@google.com> | 2015-08-20 01:16:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-20 01:16:01 +0000 |
| commit | 4ac610178525c6c439f595f07da9a5828efe5449 (patch) | |
| tree | 81257ea37728acc7e36b7d1f300679d0ef63ef52 /media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp | |
| parent | 5bb0a2cff01db0731e9d40bf3cd723b76352a16b (diff) | |
| parent | 051b8572c2751781925c0e58698dcbb52c8e268e (diff) | |
| download | frameworks_av-4ac610178525c6c439f595f07da9a5828efe5449.zip frameworks_av-4ac610178525c6c439f595f07da9a5828efe5449.tar.gz frameworks_av-4ac610178525c6c439f595f07da9a5828efe5449.tar.bz2 | |
am 051b8572: am 91860b89: SoftAVCEncoder: fix auto merge error, member names have changed.
* commit '051b8572c2751781925c0e58698dcbb52c8e268e':
SoftAVCEncoder: fix auto merge error, member names have changed.
Diffstat (limited to 'media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp')
| -rw-r--r-- | media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp b/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp index 901b667..fa6ec40 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; } |