diff options
| author | Colin Cross <ccross@google.com> | 2014-04-14 17:12:27 -0700 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2014-04-14 17:16:02 -0700 |
| commit | f6d0c1fd6d9e697bb3a891fae14c7e9d4b685de6 (patch) | |
| tree | 7278734ca980774c0ec5b5d6baa30a8587136eb0 /media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp | |
| parent | 9829344d526f87ca745208f04216ec795b239581 (diff) | |
| download | frameworks_av-f6d0c1fd6d9e697bb3a891fae14c7e9d4b685de6.zip frameworks_av-f6d0c1fd6d9e697bb3a891fae14c7e9d4b685de6.tar.gz frameworks_av-f6d0c1fd6d9e697bb3a891fae14c7e9d4b685de6.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.
(cherry picked from commit b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81)
Change-Id: I76ba94d0b67776fd7abdc83b43d47c61d6c32f4c
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, 3 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp b/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp index 500d579..da5b785 100644 --- a/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp +++ b/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp @@ -33,6 +33,8 @@ #include "SoftMPEG4Encoder.h" +#include <inttypes.h> + namespace android { template<class T> @@ -725,7 +727,7 @@ void SoftMPEG4Encoder::onQueueFilled(OMX_U32 /* portIndex */) { if (!PVEncodeVideoFrame(mHandle, &vin, &vout, &modTimeMs, outPtr, &dataLength, &nLayer) || !PVGetHintTrack(mHandle, &hintTrack)) { - ALOGE("Failed to encode frame or get hink track at frame %lld", + ALOGE("Failed to encode frame or get hink track at frame %" PRId64, mNumInputFrames); mSignalledError = true; notify(OMX_EventError, OMX_ErrorUndefined, 0, 0); |