diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-04-03 17:11:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-03 17:11:25 +0000 |
| commit | 52a23bd3f8ace9f3a6295fc2d2b97e64665d77d8 (patch) | |
| tree | 9c3f023eaffaea5a6af70438c30a4f1158e1211a /media/libstagefright/codecs/gsm | |
| parent | 8260bf63e2fa974b524029f170d9ad17b69b884f (diff) | |
| parent | 51b3ea2b8f7298bffbd246c65a606cd053357b66 (diff) | |
| download | frameworks_av-52a23bd3f8ace9f3a6295fc2d2b97e64665d77d8.zip frameworks_av-52a23bd3f8ace9f3a6295fc2d2b97e64665d77d8.tar.gz frameworks_av-52a23bd3f8ace9f3a6295fc2d2b97e64665d77d8.tar.bz2 | |
am 51b3ea2b: Merge "64-bit: Correction to OMX_U32 and OMX_S32"
* commit '51b3ea2b8f7298bffbd246c65a606cd053357b66':
64-bit: Correction to OMX_U32 and OMX_S32
Diffstat (limited to 'media/libstagefright/codecs/gsm')
| -rw-r--r-- | media/libstagefright/codecs/gsm/dec/SoftGSM.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/gsm/dec/SoftGSM.cpp b/media/libstagefright/codecs/gsm/dec/SoftGSM.cpp index 00e0c85..eef495f 100644 --- a/media/libstagefright/codecs/gsm/dec/SoftGSM.cpp +++ b/media/libstagefright/codecs/gsm/dec/SoftGSM.cpp @@ -202,13 +202,13 @@ void SoftGSM::onQueueFilled(OMX_U32 portIndex) { } if (inHeader->nFilledLen > kMaxNumSamplesPerFrame) { - ALOGE("input buffer too large (%ld).", inHeader->nFilledLen); + ALOGE("input buffer too large (%d).", inHeader->nFilledLen); notify(OMX_EventError, OMX_ErrorUndefined, 0, NULL); mSignalledError = true; } if(((inHeader->nFilledLen / 65) * 65) != inHeader->nFilledLen) { - ALOGE("input buffer not multiple of 65 (%ld).", inHeader->nFilledLen); + ALOGE("input buffer not multiple of 65 (%d).", inHeader->nFilledLen); notify(OMX_EventError, OMX_ErrorUndefined, 0, NULL); mSignalledError = true; } |