commit 2a27a640d0d9747659cc609b4384ffead090866e
author Mark Salyzyn <salyzyn@google.com> Fri Apr 11 18:20:39 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 11 18:20:39 2014 +0000
tree 2bfacc25072276b6d6d60aa5bbd0b34a708c78a5
parent 797248568b5ba32606ac0d8de024190e3cc95973
parent 51b9eb1c330d23b98ddb629200cd177bc9c39def

Merge "warnings be gone (3/4)"

media/libstagefright/mpeg2ts/ATSParser.cpp

diff --git a/media/libstagefright/mpeg2ts/ATSParser.cpp b/media/libstagefright/mpeg2ts/ATSParser.cpp
index 788ce3b..c556b01 100644
--- a/media/libstagefright/mpeg2ts/ATSParser.cpp
+++ b/media/libstagefright/mpeg2ts/ATSParser.cpp
@@ -36,6 +36,8 @@
 #include <media/IStreamSource.h>
 #include <utils/KeyedVector.h>
 
+#include <inttypes.h>
+
 namespace android {
 
 // I want the expression "y" evaluated even if verbose logging is off.
@@ -1261,8 +1263,8 @@
 }
 
 void ATSParser::updatePCR(
-        unsigned PID, uint64_t PCR, size_t byteOffsetFromStart) {
-    ALOGV("PCR 0x%016llx @ %d", PCR, byteOffsetFromStart);
+        unsigned /* PID */, uint64_t PCR, size_t byteOffsetFromStart) {
+    ALOGV("PCR 0x%016" PRIx64 " @ %zu", PCR, byteOffsetFromStart);
 
     if (mNumPCRs == 2) {
         mPCR[0] = mPCR[1];