summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Shih <robertshih@google.com>2014-02-05 20:05:17 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-02-05 20:05:17 +0000
commit7da27478ea09d7e6c8e6bb8c563ea6439c53e28f (patch)
tree805ca59135c7730290686d2da52c941df0eec9c4
parent12ae9b1459980060c8780b910d23e835590ab0fb (diff)
parent3cb78498d3f664f541ba7d28f4543cf8c12733f1 (diff)
downloadframeworks_base-7da27478ea09d7e6c8e6bb8c563ea6439c53e28f.zip
frameworks_base-7da27478ea09d7e6c8e6bb8c563ea6439c53e28f.tar.gz
frameworks_base-7da27478ea09d7e6c8e6bb8c563ea6439c53e28f.tar.bz2
Merge "android_media_MediaMuxer_setLocation: amended signature."
-rw-r--r--media/jni/android_media_MediaMuxer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/jni/android_media_MediaMuxer.cpp b/media/jni/android_media_MediaMuxer.cpp
index 2c16a05..ea890c2 100644
--- a/media/jni/android_media_MediaMuxer.cpp
+++ b/media/jni/android_media_MediaMuxer.cpp
@@ -164,7 +164,7 @@ static void android_media_MediaMuxer_setOrientationHint(
}
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);