commit feac1a43c8b674c4b526214fa8061452fd6e4846
author Narayan Kamath <narayan@google.com> Mon Mar 03 11:18:28 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Mar 03 11:18:28 2014 +0000
tree 712af37a4366959972a42533f79cb4d43e408231
parent 788207057ed4b8df4719ed8089f376ef52de9ca1
parent 62a897c6c44d82fc19207fd95692a9c93ded458f

am 62a897c6: am 525b099a: Merge "Fix ALOGVs for 64bit"

* commit '62a897c6c44d82fc19207fd95692a9c93ded458f':
  Fix ALOGVs for 64bit

libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp

diff --git a/libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp b/libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
index e503936..cb4b23e 100755
--- a/libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
+++ b/libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
@@ -701,8 +701,8 @@
                              mBGAudioPCMFileOriginalSeekPoint <=
                               (mBGAudioPCMFileTrimmedLength - len)) {
 
-                            ALOGV("Checking mBGAudioPCMFileHandle %d",
-                                (unsigned int)mBGAudioPCMFileHandle);
+                            ALOGV("Checking mBGAudioPCMFileHandle %p",
+                                  mBGAudioPCMFileHandle);
 
                             if (mBGAudioPCMFileHandle != M4OSA_NULL) {
                                 ALOGV("fillBuffer seeking file to %lld",

libvideoeditor/vss/stagefrightshells/src/VideoEditorMp3Reader.cpp

diff --git a/libvideoeditor/vss/stagefrightshells/src/VideoEditorMp3Reader.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditorMp3Reader.cpp
index af53c54..2e0d05d 100755
--- a/libvideoeditor/vss/stagefrightshells/src/VideoEditorMp3Reader.cpp
+++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditorMp3Reader.cpp
@@ -334,8 +334,8 @@
         (VideoEditorMp3Reader_Context*)context;
     M4OSA_ERR err = M4NO_ERROR;
 
-    ALOGV("VideoEditorMp3Reader_Context begin: optionId: %d Value: %d ",
-        (int)optionId,(int)pValue);
+    ALOGV("VideoEditorMp3Reader_Context begin: optionId: %u Value: %p ",
+          optionId, pValue);
 
     M4OSA_DEBUG_IF1((M4OSA_NULL == pReaderContext), M4ERR_PARAMETER,
         "invalid context pointer");