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/m4v_h263/enc/SoftMPEG4Encoder.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/m4v_h263/enc/SoftMPEG4Encoder.cpp')
| -rw-r--r-- | media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp b/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp index ee8dcf2..e25709d 100644 --- a/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp +++ b/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp @@ -685,7 +685,7 @@ void SoftMPEG4Encoder::onQueueFilled(OMX_U32 /* portIndex */) { if (mStoreMetaDataInBuffers) { if (inHeader->nFilledLen != 8) { ALOGE("MetaData buffer is wrong size! " - "(got %lu bytes, expected 8)", inHeader->nFilledLen); + "(got %u bytes, expected 8)", inHeader->nFilledLen); mSignalledError = true; notify(OMX_EventError, OMX_ErrorUndefined, 0, 0); return; @@ -773,7 +773,7 @@ uint8_t *SoftMPEG4Encoder::extractGrallocData(void *data, buffer_handle_t *buffe status_t res; if (type != kMetadataBufferTypeGrallocSource) { ALOGE("Data passed in with metadata mode does not have type " - "kMetadataBufferTypeGrallocSource (%d), has type %ld instead", + "kMetadataBufferTypeGrallocSource (%d), has type %d instead", kMetadataBufferTypeGrallocSource, type); return NULL; } |