summaryrefslogtreecommitdiffstats
path: root/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2014-04-04 14:47:28 -0700
committerMark Salyzyn <salyzyn@google.com>2014-04-15 13:18:22 -0700
commitdb43b34c3428e480f8c4c66e7e88f4001f37f91e (patch)
treebe194bf06c84b61f277a1c29c7499aa7862494a4 /libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
parent1df2557ac95a6d8a087fb15f6f842dc049f2759b (diff)
downloadframeworks_av-db43b34c3428e480f8c4c66e7e88f4001f37f91e.zip
frameworks_av-db43b34c3428e480f8c4c66e7e88f4001f37f91e.tar.gz
frameworks_av-db43b34c3428e480f8c4c66e7e88f4001f37f91e.tar.bz2
media: 64 bit compile issues
- change internal sized types to use stdint.h - printf & scanf formats - size_t or unsigned int for iterators Change-Id: Id993a70d8bf54c667c5d652b34179a2c727ed446
Diffstat (limited to 'libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp')
-rwxr-xr-xlibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp2
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