diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-04-15 22:35:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-15 22:35:00 +0000 |
| commit | e80631aa1992ca50af679cd6a018c0ffda7f9b17 (patch) | |
| tree | 6b3fcc9fbb5b02976e4bb2163e994952303bead5 /media/libstagefright/omx/GraphicBufferSource.cpp | |
| parent | d4a3cae8cc4cf924925ae57723e61c89f6c4fd51 (diff) | |
| parent | 839d11d1f7be9dff2f06c7d30a9eb39cb6782078 (diff) | |
| download | frameworks_av-e80631aa1992ca50af679cd6a018c0ffda7f9b17.zip frameworks_av-e80631aa1992ca50af679cd6a018c0ffda7f9b17.tar.gz frameworks_av-e80631aa1992ca50af679cd6a018c0ffda7f9b17.tar.bz2 | |
am 839d11d1: Merge changes I0a744dc7,Id993a70d
* commit '839d11d1f7be9dff2f06c7d30a9eb39cb6782078':
media: use size_t for integer iterator to Vector::size()
media: 64 bit compile issues
Diffstat (limited to 'media/libstagefright/omx/GraphicBufferSource.cpp')
| -rw-r--r-- | media/libstagefright/omx/GraphicBufferSource.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/media/libstagefright/omx/GraphicBufferSource.cpp b/media/libstagefright/omx/GraphicBufferSource.cpp index 44f0be7..3fe9c23 100644 --- a/media/libstagefright/omx/GraphicBufferSource.cpp +++ b/media/libstagefright/omx/GraphicBufferSource.cpp @@ -14,6 +14,8 @@ * limitations under the License. */ +#include <inttypes.h> + #define LOG_TAG "GraphicBufferSource" //#define LOG_NDEBUG 0 #include <utils/Log.h> @@ -200,7 +202,7 @@ void GraphicBufferSource::addCodecBuffer(OMX_BUFFERHEADERTYPE* header) { return; } - ALOGV("addCodecBuffer h=%p size=%lu p=%p", + ALOGV("addCodecBuffer h=%p size=%" PRIu32 " p=%p", header, header->nAllocLen, header->pBuffer); CodecBuffer codecBuffer; codecBuffer.mHeader = header; @@ -221,7 +223,7 @@ void GraphicBufferSource::codecBufferEmptied(OMX_BUFFERHEADERTYPE* header) { return; } - ALOGV("codecBufferEmptied h=%p size=%lu filled=%lu p=%p", + ALOGV("codecBufferEmptied h=%p size=%" PRIu32 " filled=%" PRIu32 " p=%p", header, header->nAllocLen, header->nFilledLen, header->pBuffer); CodecBuffer& codecBuffer(mCodecBuffers.editItemAt(cbi)); |