diff options
| author | Glenn Kasten <gkasten@android.com> | 2013-06-28 09:30:58 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-28 09:30:58 -0700 |
| commit | 83790fcce4f5cda1e7c89f1cbed452426502f227 (patch) | |
| tree | c7636bc7a6b9f7597ebe6dcf91a377448e8ec950 /media | |
| parent | 3a4ff0b8bf464c9c286d63326bea42609527051e (diff) | |
| parent | bdf33c98912090176183d3e9b9a9217dbbdca6da (diff) | |
| download | frameworks_av-83790fcce4f5cda1e7c89f1cbed452426502f227.zip frameworks_av-83790fcce4f5cda1e7c89f1cbed452426502f227.tar.gz frameworks_av-83790fcce4f5cda1e7c89f1cbed452426502f227.tar.bz2 | |
am bdf33c98: Merge "Fix compilation warning: incorrect format specifier for type \'ssize_t\'."
* commit 'bdf33c98912090176183d3e9b9a9217dbbdca6da':
Fix compilation warning: incorrect format specifier for type 'ssize_t'.
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index e600a3f..57ec7ea 100644 --- a/media/libmediaplayerservice/MediaPlayerService.cpp +++ b/media/libmediaplayerservice/MediaPlayerService.cpp @@ -321,7 +321,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", |