summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorChih-Hung Hsieh <chh@google.com>2014-12-10 21:57:15 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-10 21:57:15 +0000
commit16111eac5b63fe37b5f831244f6305bd89385248 (patch)
treebdc8cc86cf9a0c46f4ceff1d71d968f3fa024a8c /media
parent2a5b6e4c983be6ea85d41f235b2e4b250b37b2bd (diff)
parentc948a971ba70b7d9c60c56cf5977770ac61fc3f9 (diff)
downloadframeworks_av-16111eac5b63fe37b5f831244f6305bd89385248.zip
frameworks_av-16111eac5b63fe37b5f831244f6305bd89385248.tar.gz
frameworks_av-16111eac5b63fe37b5f831244f6305bd89385248.tar.bz2
am c948a971: am c15a72f6: am 1914e7ed: Merge "Fix print format mismatches."
* commit 'c948a971ba70b7d9c60c56cf5977770ac61fc3f9': Fix print format mismatches.
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp4
-rw-r--r--media/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp b/media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp
index a3274ea..1f76068 100644
--- a/media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp
+++ b/media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp
@@ -217,7 +217,7 @@ static status_t parseAudioSpecificConfig(ABitReader *bits, sp<ABuffer> *asc) {
// Apparently an extension is always considered an even
// multiple of 8 bits long.
- ALOGI("Skipping %d bits after sync extension",
+ ALOGI("Skipping %zu bits after sync extension",
8 - (numBitsInExtension & 7));
bits->skipBits(8 - (numBitsInExtension & 7));
@@ -422,7 +422,7 @@ sp<ABuffer> AMPEG4AudioAssembler::removeLATMFraming(const sp<ABuffer> &buffer) {
}
if (offset < buffer->size()) {
- ALOGI("ignoring %d bytes of trailing data", buffer->size() - offset);
+ ALOGI("ignoring %zu bytes of trailing data", buffer->size() - offset);
}
CHECK_LE(offset, buffer->size());
diff --git a/media/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp b/media/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp
index 7eb6542..156004c 100644
--- a/media/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp
+++ b/media/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp
@@ -360,7 +360,7 @@ ARTPAssembler::AssemblyStatus AMPEG4ElementaryAssembler::addPacket(
}
if (offset != buffer->size()) {
- ALOGW("potentially malformed packet (offset %d, size %d)",
+ ALOGW("potentially malformed packet (offset %zu, size %zu)",
offset, buffer->size());
}
}