commit b8d23091df36a530f646d9cdec1078fa38f95389
author Robert Shih <robertshih@google.com> Thu Jul 14 21:06:03 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 14 21:06:03 2016 +0000
tree 1420d519c5fe4d482300207a7bcc2b53a427c438
parent a365cebbe489244ea7a63b67e504b85ae4b74b89
parent 94742171f17acc8bd39180c5592d23b616b60575

Fix build am: 6f85d83163 am: cea6041539 am: ac11d74c81
am: 94742171f1

Change-Id: Ifa1e2ab0d259b2919a4f250d84209987aa0eb71a

media/libstagefright/codecs/mp3dec/SoftMP3.cpp

diff --git a/media/libstagefright/codecs/mp3dec/SoftMP3.cpp b/media/libstagefright/codecs/mp3dec/SoftMP3.cpp
index 79206ea..0822c34 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", (unsigned long)outHeader->nAllocLen, len);
+        ALOGE("memset buffer too small: got %u, expected %zu", outHeader->nAllocLen, len);
         android_errorWriteLog(0x534e4554, "29422022");
         notify(OMX_EventError, OMX_ErrorUndefined, OUTPUT_BUFFER_TOO_SMALL, NULL);
         mSignalledError = true;