commit a365cebbe489244ea7a63b67e504b85ae4b74b89
author Robert Shih <robertshih@google.com> Thu Jul 14 20:00:57 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 14 20:00:57 2016 +0000
tree 852b6c4c641df38eff7e7ebdd092fedecc913896
parent b6b00fc651f952a0702ba2f877b5c2aeb4d8f5ca
parent 196add98cc7d0790908fe11774eac5680d097cc3

Fix build am: c5b95cd33a am: 4828c2cc73 am: 6f30a038db
am: 196add98cc

Change-Id: I441135beee7144639775ff1999dbe2230246b7b3

media/libstagefright/codecs/mp3dec/SoftMP3.cpp

diff --git a/media/libstagefright/codecs/mp3dec/SoftMP3.cpp b/media/libstagefright/codecs/mp3dec/SoftMP3.cpp
index ec85ea9..79206ea 100644
--- a/media/libstagefright/codecs/mp3dec/SoftMP3.cpp
+++ b/media/libstagefright/codecs/mp3dec/SoftMP3.cpp
@@ -122,7 +122,7 @@
 
 void *SoftMP3::memsetSafe(OMX_BUFFERHEADERTYPE *outHeader, int c, size_t len) {
     if (len > outHeader->nAllocLen) {
-        ALOGE("memset buffer too small: got %lu, expected %zu", outHeader->nAllocLen, len);
+        ALOGE("memset buffer too small: got %lu, expected %zu", (unsigned long)outHeader->nAllocLen, len);
         android_errorWriteLog(0x534e4554, "29422022");
         notify(OMX_EventError, OMX_ErrorUndefined, OUTPUT_BUFFER_TOO_SMALL, NULL);
         mSignalledError = true;