diff options
| author | Robert Shih <robertshih@google.com> | 2014-05-30 18:05:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-30 18:05:35 +0000 |
| commit | a037bcebfa0afdf89e273b207f134e4c5d909a65 (patch) | |
| tree | 721b978ab0a9502cc317f317a371fe1f7cd21f80 /media | |
| parent | b68f5f0932511fb9975b7e04eebe48707af59e0a (diff) | |
| parent | a034dac7be0658e59c73a880e958cab3c723323b (diff) | |
| download | frameworks_base-a037bcebfa0afdf89e273b207f134e4c5d909a65.zip frameworks_base-a037bcebfa0afdf89e273b207f134e4c5d909a65.tar.gz frameworks_base-a037bcebfa0afdf89e273b207f134e4c5d909a65.tar.bz2 | |
am a034dac7: android_media_MediaMuxer_setLocation: amended signature.
* commit 'a034dac7be0658e59c73a880e958cab3c723323b':
android_media_MediaMuxer_setLocation: amended signature.
Diffstat (limited to 'media')
| -rw-r--r-- | media/jni/android_media_MediaMuxer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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_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); |