summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Marco Nelissen <marcone@google.com> 2015-01-27 20:25:59 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-01-27 20:25:59 +0000
commit3ea395ddc7785bf8fb6df1e5e6ed142c9336a7eb (patch)
tree24a2c910f75d2655d8eb47ebe5b10e6a29fa5129
parent99985d98c23b32acc0014031d7b88ee4eed21a4b (diff)
parent4e85359879cb417f0540a5cfbf91242ebd9546c7 (diff)
am 4e853598: Merge "Fix printf format"
* commit '4e85359879cb417f0540a5cfbf91242ebd9546c7': Fix printf format
-rw-r--r--media/jni/soundpool/SoundPool.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/jni/soundpool/SoundPool.cpp b/media/jni/soundpool/SoundPool.cpp
index f42f850dae05..a8b91d24c5a9 100644
--- a/media/jni/soundpool/SoundPool.cpp
+++ b/media/jni/soundpool/SoundPool.cpp
@@ -479,7 +479,7 @@ static status_t decode(int fd, int64_t offset, int64_t length,
uint32_t *rate, int *numChannels, audio_format_t *audioFormat,
sp<MemoryHeapBase> heap, size_t *memsize) {
- ALOGV("fd %d, offset %lld, size %lld", fd, offset, length);
+ ALOGV("fd %d, offset %" PRId64 ", size %" PRId64, fd, offset, length);
AMediaExtractor *ex = AMediaExtractor_new();
status_t err = AMediaExtractor_setDataSourceFd(ex, fd, offset, length);
@@ -523,7 +523,7 @@ static status_t decode(int fd, int64_t offset, int64_t length,
while (!sawOutputEOS) {
if (!sawInputEOS) {
ssize_t bufidx = AMediaCodec_dequeueInputBuffer(codec, 5000);
- ALOGV("input buffer %d", bufidx);
+ ALOGV("input buffer %zd", bufidx);
if (bufidx >= 0) {
size_t bufsize;
uint8_t *buf = AMediaCodec_getInputBuffer(codec, bufidx, &bufsize);