commit 080d666878c3f3ad091f85af95b43271a990c8f5
author Pawin Vongmasa <pawin@google.com> Fri Aug 19 11:47:22 2016 -0700
committer Pawin Vongmasa <pawin@google.com> Fri Aug 19 11:47:22 2016 -0700
tree f115b5bb1162f674b01bf82854644f2e8b6f4613
parent 3bc41e29a5bd51b06072097376466c52f373a44e
parent f37ad284433d0b858a1b147ab25a3c767b486689

resolve merge conflicts of f37ad28 to master

Change-Id: I301ca44edf99188636c1113c9a705e8cc292f101

media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp

diff --git a/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp b/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
index 9f113e23..1dd631a 100644
--- a/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
+++ b/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
@@ -213,8 +213,8 @@
             OMX_U32 yFrameSize = sizeof(uint8) * mHandle->size;
             if ((outHeader->nAllocLen < yFrameSize) ||
                     (outHeader->nAllocLen - yFrameSize < yFrameSize / 2)) {
-                ALOGE("Too small output buffer for reference frame: %zu bytes",
-                        (size_t)outHeader->nAllocLen);
+                ALOGE("Too small output buffer for reference frame: %lu bytes",
+                        (unsigned long)outHeader->nAllocLen);
                 android_errorWriteLog(0x534e4554, "30033990");
                 notify(OMX_EventError, OMX_ErrorUndefined, 0, NULL);
                 mSignalledError = true;