diff options
| author | Glenn Kasten <gkasten@android.com> | 2013-06-28 10:48:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-28 10:48:43 -0700 |
| commit | f761cec9aaca76bb84264f3666764d24a9c243e2 (patch) | |
| tree | 6fc6475ee51c767b214544c8f91384cbd359719e /media/libmediaplayerservice | |
| parent | 226939c6d250d7d90f84a8667edde7efb879afc9 (diff) | |
| parent | 903871da7a7c71b8718133e60e2f0835837b5f3f (diff) | |
| download | frameworks_av-f761cec9aaca76bb84264f3666764d24a9c243e2.zip frameworks_av-f761cec9aaca76bb84264f3666764d24a9c243e2.tar.gz frameworks_av-f761cec9aaca76bb84264f3666764d24a9c243e2.tar.bz2 | |
am 903871da: am 83790fcc: am bdf33c98: Merge "Fix compilation warning: incorrect format specifier for type \'ssize_t\'."
* commit '903871da7a7c71b8718133e60e2f0835837b5f3f':
Fix compilation warning: incorrect format specifier for type 'ssize_t'.
Diffstat (limited to 'media/libmediaplayerservice')
| -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 53dce65..afde373 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", |