commit a9aa6baa5d86fc1a5bd37fc636d766d9e3ad2507
author Andreas Huber <andih@google.com> Fri Jun 28 22:26:42 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jun 28 22:26:44 2013 +0000
tree f8e1cec5cd70058e39131d5c9e4fc16d651eb6fa
parent bdf33c98912090176183d3e9b9a9217dbbdca6da
parent fca812565cebd229fba8be32bad14983c5252a7b

Merge "Set u.ext_data to null after it has been freed"

media/libmediaplayerservice/MediaPlayerService.cpp

diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index 25aa611..193b02c 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -307,7 +307,7 @@
                 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",