commit 6f30a038dbb25ac4d74e326f7489305b99d3c343
author Robert Shih <robertshih@google.com> Thu Jul 14 19:55:19 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 14 19:55:19 2016 +0000
tree b20437be372d7abc1f22abc415e771a26a691563
parent c8950e29676cb13198e29b83a258f625da8c6b96
parent 4828c2cc7351a75e52f35278dcd5ae01df751979

Fix build am: c5b95cd33a
am: 4828c2cc73

Change-Id: Ia0a2d000a864970a58dc5d39914f665e2c6baa9e

media/libstagefright/codecs/mp3dec/SoftMP3.cpp

diff --git a/media/libstagefright/codecs/mp3dec/SoftMP3.cpp b/media/libstagefright/codecs/mp3dec/SoftMP3.cpp
index daef471..54fe622 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;