diff options
| author | Colin Cross <ccross@android.com> | 2014-03-19 16:59:00 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2014-03-19 17:00:58 -0700 |
| commit | b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81 (patch) | |
| tree | e4b01823fbfbd71ae3f548e78cfbf21d0d988ad3 /media/libstagefright/webm | |
| parent | d4a31b8bcd7df99dfce2f25a32badf4611a6ba1a (diff) | |
| download | frameworks_av-b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81.zip frameworks_av-b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81.tar.gz frameworks_av-b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81.tar.bz2 | |
libstagefright: fix 64-bit warnings
%lld -> %" PRId64 " for int64_t
%d -> %zu for size_t
Also fixes some casts from void* to integer types, and some comparisons
between signed and unsigned.
Change-Id: I9c52f76240e39399da252c66459042a6fc626a90
Diffstat (limited to 'media/libstagefright/webm')
| -rw-r--r-- | media/libstagefright/webm/WebmElement.cpp | 2 | ||||
| -rw-r--r-- | media/libstagefright/webm/WebmFrameThread.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/webm/WebmElement.cpp b/media/libstagefright/webm/WebmElement.cpp index c978966..a008cab 100644 --- a/media/libstagefright/webm/WebmElement.cpp +++ b/media/libstagefright/webm/WebmElement.cpp @@ -119,7 +119,7 @@ int WebmElement::write(int fd, uint64_t& size) { off64_t mapSize = curOff - alignedOff; off64_t pageOff = off - alignedOff; void *dst = ::mmap64(NULL, mapSize, PROT_WRITE, MAP_SHARED, fd, alignedOff); - if ((int) dst == -1) { + if (dst == MAP_FAILED) { ALOGE("mmap64 failed; errno = %d", errno); ALOGE("fd %d; flags: %o", fd, ::fcntl(fd, F_GETFL, 0)); return errno; diff --git a/media/libstagefright/webm/WebmFrameThread.cpp b/media/libstagefright/webm/WebmFrameThread.cpp index 5addd3c..a4b8a42 100644 --- a/media/libstagefright/webm/WebmFrameThread.cpp +++ b/media/libstagefright/webm/WebmFrameThread.cpp @@ -48,7 +48,7 @@ status_t WebmFrameThread::start() { status_t WebmFrameThread::stop() { void *status; pthread_join(mThread, &status); - return (status_t) status; + return (status_t)(intptr_t)status; } //================================================================================================= |