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/timedtext | |
| 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/timedtext')
| -rw-r--r-- | media/libstagefright/timedtext/TimedTextPlayer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libstagefright/timedtext/TimedTextPlayer.cpp b/media/libstagefright/timedtext/TimedTextPlayer.cpp index 9fb0afe..a070487 100644 --- a/media/libstagefright/timedtext/TimedTextPlayer.cpp +++ b/media/libstagefright/timedtext/TimedTextPlayer.cpp @@ -18,6 +18,7 @@ #define LOG_TAG "TimedTextPlayer" #include <utils/Log.h> +#include <inttypes.h> #include <limits.h> #include <media/stagefright/foundation/ADebug.h> #include <media/stagefright/foundation/AMessage.h> @@ -271,7 +272,7 @@ int64_t TimedTextPlayer::delayUsFromCurrentTime(int64_t fireTimeUs) { sp<MediaPlayerBase> listener = mListener.promote(); if (listener == NULL) { // TODO: it may be better to return kInvalidTimeUs - ALOGE("%s: Listener is NULL. (fireTimeUs = %lld)", + ALOGE("%s: Listener is NULL. (fireTimeUs = %" PRId64" )", __FUNCTION__, fireTimeUs); return 0; } |