diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-24 13:54:09 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-06-24 13:54:09 -0700 |
| commit | 2387208c9ecb5dba01bd933312c80c5133bd3c41 (patch) | |
| tree | cc2b5de61934f318bcb3806d5a3705527b18c947 /media/jni | |
| parent | ffcdad9faaa03c116bacc5ac88a5aa2e015dc6d1 (diff) | |
| parent | 3d7b8d1aa6a362292f56defbe8fb2d5653f79282 (diff) | |
| download | frameworks_base-2387208c9ecb5dba01bd933312c80c5133bd3c41.zip frameworks_base-2387208c9ecb5dba01bd933312c80c5133bd3c41.tar.gz frameworks_base-2387208c9ecb5dba01bd933312c80c5133bd3c41.tar.bz2 | |
am 3d7b8d1a: Merge change 5158 into donut
Merge commit '3d7b8d1aa6a362292f56defbe8fb2d5653f79282'
* commit '3d7b8d1aa6a362292f56defbe8fb2d5653f79282':
Use a ref-counted callback interface for Camera.
Diffstat (limited to 'media/jni')
| -rw-r--r-- | media/jni/android_media_MediaRecorder.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/jni/android_media_MediaRecorder.cpp b/media/jni/android_media_MediaRecorder.cpp index 7bfeb83..0273a5a 100644 --- a/media/jni/android_media_MediaRecorder.cpp +++ b/media/jni/android_media_MediaRecorder.cpp @@ -41,7 +41,7 @@ using namespace android; // ---------------------------------------------------------------------------- // helper function to extract a native Camera object from a Camera Java object -extern sp<Camera> get_native_camera(JNIEnv *env, jobject thiz, struct camera_context_t** context); +extern sp<Camera> get_native_camera(JNIEnv *env, jobject thiz, struct JNICameraContext** context); struct fields_t { jfieldID context; |