commit be76be83b188bb4cbcd3bc9bd6398af4d444ecb0
author Narayan Kamath <narayan@google.com> Thu Sep 04 11:06:47 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 04 11:06:47 2014 +0000
tree cfd4939fe84f16fabcab73b594c3132b0ac1f03b
parent c1ce74cab0e83d574df1bd7bb7b7eb16eec171f6
parent 39478fdfcf4d7362b73a5aefb4627159e568d3fb

Merge "android_media_MediaMuxer_setLocation: amended signature."

media/jni/android_media_MediaMuxer.cpp

diff --git a/media/jni/android_media_MediaMuxer.cpp b/media/jni/android_media_MediaMuxer.cpp
index 3561b06..3fef446f 100644
--- a/media/jni/android_media_MediaMuxer.cpp
+++ b/media/jni/android_media_MediaMuxer.cpp
@@ -164,7 +164,7 @@
 }
 
 static void android_media_MediaMuxer_setLocation(
-        JNIEnv *env, jclass clazz, jint nativeObject, jint latitude, jint longitude) {
+        JNIEnv *env, jclass clazz, jlong nativeObject, jint latitude, jint longitude) {
     MediaMuxer* muxer = reinterpret_cast<MediaMuxer *>(nativeObject);
 
     status_t res = muxer->setLocation(latitude, longitude);