summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2014-03-19 16:59:00 -0700
committerColin Cross <ccross@android.com>2014-03-19 17:00:58 -0700
commitb4a7a2df4c28c3f32b5d877b54831d2cc5d78f81 (patch)
treee4b01823fbfbd71ae3f548e78cfbf21d0d988ad3 /media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
parentd4a31b8bcd7df99dfce2f25a32badf4611a6ba1a (diff)
downloadframeworks_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/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp')
-rw-r--r--media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp4
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 2c73e57..ee8dcf2 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);