diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-04-11 18:20:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-11 18:20:39 +0000 |
| commit | 2a27a640d0d9747659cc609b4384ffead090866e (patch) | |
| tree | 2bfacc25072276b6d6d60aa5bbd0b34a708c78a5 | |
| parent | 797248568b5ba32606ac0d8de024190e3cc95973 (diff) | |
| parent | 51b9eb1c330d23b98ddb629200cd177bc9c39def (diff) | |
| download | frameworks_av-2a27a640d0d9747659cc609b4384ffead090866e.zip frameworks_av-2a27a640d0d9747659cc609b4384ffead090866e.tar.gz frameworks_av-2a27a640d0d9747659cc609b4384ffead090866e.tar.bz2 | |
Merge "warnings be gone (3/4)"
| -rw-r--r-- | media/libstagefright/mpeg2ts/ATSParser.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
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 @@ bool ATSParser::PTSTimeDeltaEstablished() { } 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]; |