commit 4cd0d582379ca9decba7ee0b99010d9a39f298de
author Mark Salyzyn <salyzyn@google.com> Fri Apr 11 18:26:28 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Apr 11 18:26:28 2014 +0000
tree 96a869d3d4f9b51a0bce75ffffbdf810089d0425
parent 8819b515f541daea4288a87cfbae37561cb80b13
parent 0938c6f7a1e713030b04e32548012f0c29c94f4d

am 0938c6f7: Merge "warnings be gone (4/4)"

* commit '0938c6f7a1e713030b04e32548012f0c29c94f4d':
  warnings be gone (4/4)

media/libstagefright/matroska/MatroskaExtractor.cpp

diff --git a/media/libstagefright/matroska/MatroskaExtractor.cpp b/media/libstagefright/matroska/MatroskaExtractor.cpp
index 775350d..a460f8b 100644
--- a/media/libstagefright/matroska/MatroskaExtractor.cpp
+++ b/media/libstagefright/matroska/MatroskaExtractor.cpp
@@ -33,6 +33,8 @@
 #include <media/stagefright/Utils.h>
 #include <utils/String8.h>
 
+#include <inttypes.h>
+
 namespace android {
 
 struct DataSourceReader : public mkvparser::IMkvReader {
@@ -409,8 +411,8 @@
         if (isAudio || block()->IsKey()) {
             // Accept the first key frame
             *actualFrameTimeUs = (block()->GetTime(mCluster) + 500LL) / 1000LL;
-            ALOGV("Requested seek point: %lld actual: %lld",
-                  seekTimeUs, actualFrameTimeUs);
+            ALOGV("Requested seek point: %" PRId64 " actual: %" PRId64,
+                  seekTimeUs, *actualFrameTimeUs);
             break;
         }
     }