diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-04-11 22:03:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-11 22:03:28 +0000 |
| commit | b1b1e303d93a5c67eedeca6ef3039be6cb4dc9f9 (patch) | |
| tree | bc494022de5859e096092d63aaffceed5cc2b018 /media/libstagefright/matroska | |
| parent | a7281ee11a27d5fa3d9fa62eb8d2c6465007eb50 (diff) | |
| parent | e523889332b88348e673137d272854278acbef8f (diff) | |
| download | frameworks_av-b1b1e303d93a5c67eedeca6ef3039be6cb4dc9f9.zip frameworks_av-b1b1e303d93a5c67eedeca6ef3039be6cb4dc9f9.tar.gz frameworks_av-b1b1e303d93a5c67eedeca6ef3039be6cb4dc9f9.tar.bz2 | |
am e5238893: Merge "Fix aosp_arm64 mirror-aosp-master build 1119326"
* commit 'e523889332b88348e673137d272854278acbef8f':
Fix aosp_arm64 mirror-aosp-master build 1119326
Diffstat (limited to 'media/libstagefright/matroska')
| -rw-r--r-- | media/libstagefright/matroska/Android.mk | 2 | ||||
| -rw-r--r-- | media/libstagefright/matroska/MatroskaExtractor.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/media/libstagefright/matroska/Android.mk b/media/libstagefright/matroska/Android.mk index 446ff8c..2d8c1e1 100644 --- a/media/libstagefright/matroska/Android.mk +++ b/media/libstagefright/matroska/Android.mk @@ -8,7 +8,7 @@ LOCAL_C_INCLUDES:= \ $(TOP)/external/libvpx/libwebm \ $(TOP)/frameworks/native/include/media/openmax \ -LOCAL_CFLAGS += -Wno-multichar -Werror +LOCAL_CFLAGS += -Wno-multichar LOCAL_MODULE:= libstagefright_matroska diff --git a/media/libstagefright/matroska/MatroskaExtractor.cpp b/media/libstagefright/matroska/MatroskaExtractor.cpp index a460f8b..c3b4d59 100644 --- a/media/libstagefright/matroska/MatroskaExtractor.cpp +++ b/media/libstagefright/matroska/MatroskaExtractor.cpp @@ -185,7 +185,7 @@ MatroskaSource::MatroskaSource( CHECK_GE(avccSize, 5u); mNALSizeLen = 1 + (avcc[4] & 3); - ALOGV("mNALSizeLen = %d", mNALSizeLen); + ALOGV("mNALSizeLen = %zu", mNALSizeLen); } else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_AAC)) { mType = AAC; } @@ -322,7 +322,7 @@ void BlockIterator::seek( // Special case the 0 seek to avoid loading Cues when the application // extraneously seeks to 0 before playing. if (seekTimeNs <= 0) { - ALOGV("Seek to beginning: %lld", seekTimeUs); + ALOGV("Seek to beginning: %" PRId64, seekTimeUs); mCluster = pSegment->GetFirst(); mBlockEntryIndex = 0; do { @@ -331,7 +331,7 @@ void BlockIterator::seek( return; } - ALOGV("Seeking to: %lld", seekTimeUs); + ALOGV("Seeking to: %" PRId64, seekTimeUs); // If the Cues have not been located then find them. const mkvparser::Cues* pCues = pSegment->GetCues(); @@ -380,7 +380,7 @@ void BlockIterator::seek( for (size_t index = 0; index < pTracks->GetTracksCount(); ++index) { pTrack = pTracks->GetTrackByIndex(index); if (pTrack && pTrack->GetType() == 1) { // VIDEO_TRACK - ALOGV("Video track located at %d", index); + ALOGV("Video track located at %zu", index); break; } } |