diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-04-15 23:37:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-15 23:37:19 +0000 |
| commit | 1b24cf32e02a1372e57b3a2a432bc0adfe496e6d (patch) | |
| tree | 220f4583ae1081df62fa5c861eed3e9e90a24515 /media/libstagefright/omx/GraphicBufferSource.cpp | |
| parent | 4845b69f70ff457be8d8908f6eb61e2af67e00d3 (diff) | |
| parent | e80631aa1992ca50af679cd6a018c0ffda7f9b17 (diff) | |
| download | frameworks_av-1b24cf32e02a1372e57b3a2a432bc0adfe496e6d.zip frameworks_av-1b24cf32e02a1372e57b3a2a432bc0adfe496e6d.tar.gz frameworks_av-1b24cf32e02a1372e57b3a2a432bc0adfe496e6d.tar.bz2 | |
am e80631aa: am 839d11d1: Merge changes I0a744dc7,Id993a70d
* commit 'e80631aa1992ca50af679cd6a018c0ffda7f9b17':
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 1be76b3..3df57b4 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> @@ -205,7 +207,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; @@ -226,7 +228,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)); |