diff options
| author | Wei Jia <wjia@google.com> | 2015-08-18 03:53:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-18 03:53:00 +0000 |
| commit | 051b8572c2751781925c0e58698dcbb52c8e268e (patch) | |
| tree | 8b1cc9e25587bd8041f1b2edb24144d5c0d8a22c | |
| parent | e264b770b41eff604ca730ef9172c249b652557b (diff) | |
| parent | 91860b89488b3ee4644c539e89e657fbb79fb6ad (diff) | |
| download | frameworks_av-051b8572c2751781925c0e58698dcbb52c8e268e.zip frameworks_av-051b8572c2751781925c0e58698dcbb52c8e268e.tar.gz frameworks_av-051b8572c2751781925c0e58698dcbb52c8e268e.tar.bz2 | |
am 91860b89: SoftAVCEncoder: fix auto merge error, member names have changed.
* commit '91860b89488b3ee4644c539e89e657fbb79fb6ad':
SoftAVCEncoder: fix auto merge error, member names have changed.
| -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 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; } |