diff options
| author | Marco Nelissen <marcone@google.com> | 2015-01-27 20:33:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-27 20:33:09 +0000 |
| commit | 2c2415a552b62016886af62419080ca7ac327871 (patch) | |
| tree | 7504889c906c3e17c435daeff740ccc874556bb1 /media | |
| parent | 847514499f5920d073f5cd402dd0d3bbd19ac2c1 (diff) | |
| parent | 3ea395ddc7785bf8fb6df1e5e6ed142c9336a7eb (diff) | |
| download | frameworks_base-2c2415a552b62016886af62419080ca7ac327871.zip frameworks_base-2c2415a552b62016886af62419080ca7ac327871.tar.gz frameworks_base-2c2415a552b62016886af62419080ca7ac327871.tar.bz2 | |
am 3ea395dd: am 4e853598: Merge "Fix printf format"
* commit '3ea395ddc7785bf8fb6df1e5e6ed142c9336a7eb':
Fix printf format
Diffstat (limited to 'media')
| -rw-r--r-- | media/jni/soundpool/SoundPool.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/jni/soundpool/SoundPool.cpp b/media/jni/soundpool/SoundPool.cpp index f42f850..a8b91d24c 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); |
