summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@android.com>2013-06-28 16:28:48 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-06-28 16:28:49 +0000
commitbdf33c98912090176183d3e9b9a9217dbbdca6da (patch)
tree03efbb6dff1fbad998859225e3ae49901211d417
parentd74a9ee83fd6e033fd2260ca3777390d7e5f817a (diff)
parent7d409691ed61f96bac6672b59f368cd3cc8ea2d8 (diff)
Merge "Fix compilation warning: incorrect format specifier for type 'ssize_t'."
-rw-r--r--media/libmediaplayerservice/MediaPlayerService.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index 25aa6117..193b02ce 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -307,7 +307,7 @@ status_t MediaPlayerService::AudioCache::dump(int fd, const Vector<String16>& ar
mHeap->getBase(), mHeap->getSize(), mHeap->getFlags(), mHeap->getDevice());
result.append(buffer);
}
- snprintf(buffer, 255, " msec per frame(%f), channel count(%d), format(%d), frame count(%ld)\n",
+ snprintf(buffer, 255, " msec per frame(%f), channel count(%d), format(%d), frame count(%zd)\n",
mMsecsPerFrame, mChannelCount, mFormat, mFrameCount);
result.append(buffer);
snprintf(buffer, 255, " sample rate(%d), size(%d), error(%d), command complete(%s)\n",