diff options
| author | Wei Jia <wjia@google.com> | 2015-08-17 20:13:17 -0700 |
|---|---|---|
| committer | Wei Jia <wjia@google.com> | 2015-08-17 20:13:17 -0700 |
| commit | 91860b89488b3ee4644c539e89e657fbb79fb6ad (patch) | |
| tree | 8b1cc9e25587bd8041f1b2edb24144d5c0d8a22c /media/libstagefright/codecs/avc | |
| parent | d9d6c465d94f64e3705f234fa3f53e0341bc2b41 (diff) | |
| download | frameworks_av-91860b89488b3ee4644c539e89e657fbb79fb6ad.zip frameworks_av-91860b89488b3ee4644c539e89e657fbb79fb6ad.tar.gz frameworks_av-91860b89488b3ee4644c539e89e657fbb79fb6ad.tar.bz2 | |
SoftAVCEncoder: fix auto merge error, member names have changed.
Bug: 20674674
Change-Id: I511c22d59789e1cc3a21fe13ea08ac3752e737c6
Diffstat (limited to 'media/libstagefright/codecs/avc')
| -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; } |