summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorZhijun He <zhijunhe@google.com>2015-03-23 17:30:27 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-03-23 17:30:28 +0000
commit709a4de485a016195252e15498c105ecd25851a8 (patch)
tree26b4a4bd03220e371f353682c39dea5c98794b67 /media
parentecad2e2c344651fa9538f113d908a405acbc03b6 (diff)
parentd1cbc684053986c6c9efc6220bd79d654932b3d0 (diff)
downloadframeworks_base-709a4de485a016195252e15498c105ecd25851a8.zip
frameworks_base-709a4de485a016195252e15498c105ecd25851a8.tar.gz
frameworks_base-709a4de485a016195252e15498c105ecd25851a8.tar.bz2
Merge "media: fix build break"
Diffstat (limited to 'media')
-rw-r--r--media/jni/android_media_ImageWriter.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/jni/android_media_ImageWriter.cpp b/media/jni/android_media_ImageWriter.cpp
index 1433c79..d10df3e9 100644
--- a/media/jni/android_media_ImageWriter.cpp
+++ b/media/jni/android_media_ImageWriter.cpp
@@ -435,7 +435,7 @@ static void ImageWriter_queueImage(JNIEnv* env, jobject thiz, jlong nativeCtx, j
Image_unlockIfLocked(env, image);
// Set timestamp
- ALOGV("timestamp to be queued: %lld", timestampNs);
+ ALOGV("timestamp to be queued: %" PRId64, timestampNs);
res = native_window_set_buffers_timestamp(anw.get(), timestampNs);
if (res != OK) {
jniThrowRuntimeException(env, "Set timestamp failed");