diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-04-03 10:20:09 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2014-04-03 10:20:09 -0700 |
| commit | 619fd4d6d4d815065becbdf360422ee40dfa7690 (patch) | |
| tree | 1722d64e9bafe4c28f50b18dd9d4aa2cf025ca75 /media/libstagefright/codecs/gsm | |
| parent | 0a8be80261d61e29ab4a99720e68879ae7bc3c0e (diff) | |
| parent | 52a23bd3f8ace9f3a6295fc2d2b97e64665d77d8 (diff) | |
| download | frameworks_av-619fd4d6d4d815065becbdf360422ee40dfa7690.zip frameworks_av-619fd4d6d4d815065becbdf360422ee40dfa7690.tar.gz frameworks_av-619fd4d6d4d815065becbdf360422ee40dfa7690.tar.bz2 | |
Merge commit '52a23bd3' into manualmerge
Change-Id: I7a6105f467a2fa3631c62be3d306845e9cf9b365
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 18f7d29..4debc48 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; } |