diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-04-11 18:21:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-11 18:21:03 +0000 |
| commit | 0938c6f7a1e713030b04e32548012f0c29c94f4d (patch) | |
| tree | b0b4122174721e31b1be7b39bfc9d24a00cf5265 | |
| parent | 2a27a640d0d9747659cc609b4384ffead090866e (diff) | |
| parent | bc64e09a65bd5ba97706d2420449b9710c9e9c01 (diff) | |
| download | frameworks_av-0938c6f7a1e713030b04e32548012f0c29c94f4d.zip frameworks_av-0938c6f7a1e713030b04e32548012f0c29c94f4d.tar.gz frameworks_av-0938c6f7a1e713030b04e32548012f0c29c94f4d.tar.bz2 | |
Merge "warnings be gone (4/4)"
| -rw-r--r-- | media/libstagefright/matroska/MatroskaExtractor.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/media/libstagefright/matroska/MatroskaExtractor.cpp b/media/libstagefright/matroska/MatroskaExtractor.cpp index 4498746..0be6032 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 @@ void BlockIterator::seek( 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; } } |