diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-04-11 14:29:37 -0700 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2014-04-11 14:54:52 -0700 |
| commit | 4850983c3a9131af32d0fe61dd9ce3d1e5d735b5 (patch) | |
| tree | 82f9fd986b28db58f18f80e9e2033a8e1fe48be6 /media/libstagefright/matroska | |
| parent | a133bc87eb8269a6fa61772cb708f10c9c3b7a87 (diff) | |
| download | frameworks_av-4850983c3a9131af32d0fe61dd9ce3d1e5d735b5.zip frameworks_av-4850983c3a9131af32d0fe61dd9ce3d1e5d735b5.tar.gz frameworks_av-4850983c3a9131af32d0fe61dd9ce3d1e5d735b5.tar.bz2 | |
Fix aosp_arm64 mirror-aosp-master build 1119326
Remove -Werror that was set in 'warnings be gone'
Change-Id: I2379dc56f04a6d0ac50f90e6d1cdf05fce3a5c30
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 0be6032..8f98b22 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; } } |