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/aacdec/SoftAAC2.cpp | |
| 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/aacdec/SoftAAC2.cpp')
| -rw-r--r-- | media/libstagefright/codecs/aacdec/SoftAAC2.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp index 4ac8999..532e36f 100644 --- a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp +++ b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp @@ -387,7 +387,7 @@ void SoftAAC2::onQueueFilled(OMX_U32 portIndex) { bool signalError = false; if (inHeader->nFilledLen < 7) { ALOGE("Audio data too short to contain even the ADTS header. " - "Got %ld bytes.", inHeader->nFilledLen); + "Got %d bytes.", inHeader->nFilledLen); hexdump(adtsHeader, inHeader->nFilledLen); signalError = true; } else { @@ -400,7 +400,7 @@ void SoftAAC2::onQueueFilled(OMX_U32 portIndex) { if (inHeader->nFilledLen < aac_frame_length) { ALOGE("Not enough audio data for the complete frame. " - "Got %ld bytes, frame size according to the ADTS " + "Got %d bytes, frame size according to the ADTS " "header is %u bytes.", inHeader->nFilledLen, aac_frame_length); hexdump(adtsHeader, inHeader->nFilledLen); |