diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-04-15 22:35:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-15 22:35:00 +0000 |
| commit | e80631aa1992ca50af679cd6a018c0ffda7f9b17 (patch) | |
| tree | 6b3fcc9fbb5b02976e4bb2163e994952303bead5 /libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp | |
| parent | d4a3cae8cc4cf924925ae57723e61c89f6c4fd51 (diff) | |
| parent | 839d11d1f7be9dff2f06c7d30a9eb39cb6782078 (diff) | |
| download | frameworks_av-e80631aa1992ca50af679cd6a018c0ffda7f9b17.zip frameworks_av-e80631aa1992ca50af679cd6a018c0ffda7f9b17.tar.gz frameworks_av-e80631aa1992ca50af679cd6a018c0ffda7f9b17.tar.bz2 | |
am 839d11d1: Merge changes I0a744dc7,Id993a70d
* commit '839d11d1f7be9dff2f06c7d30a9eb39cb6782078':
media: use size_t for integer iterator to Vector::size()
media: 64 bit compile issues
Diffstat (limited to 'libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp')
| -rwxr-xr-x | libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp index 4787680..ca7db68 100755 --- a/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp +++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp @@ -857,7 +857,7 @@ M4OSA_ERR VideoEditorVideoEncoder_processOutputBuffer( ALOGV("VideoEditorVideoEncoder_processOutputBuffer : buffer is empty"); goto cleanUp; } - VIDEOEDITOR_CHECK(0 == ((M4OSA_UInt32)buffer->data())%4, M4ERR_PARAMETER); + VIDEOEDITOR_CHECK(0 == (((intptr_t)buffer->data())%4), M4ERR_PARAMETER); VIDEOEDITOR_CHECK(buffer->meta_data().get(), M4ERR_PARAMETER); if ( buffer->meta_data()->findInt32(kKeyIsCodecConfig, &i32Tmp) && i32Tmp ){ { // Display the DSI |