diff options
| author | glaznev@webrtc.org <glaznev@webrtc.org> | 2014-11-05 01:15:10 +0000 |
|---|---|---|
| committer | glaznev@webrtc.org <glaznev@webrtc.org> | 2014-11-05 01:15:10 +0000 |
| commit | 20b2dc6bfbfc84cbdcbc733314704fdcc5f9f700 (patch) | |
| tree | 39d0e08cf92122ec9e16a1891da655e4992b5645 | |
| parent | d1f71cc38e9147f7d30bf45d35d432446cd65f7b (diff) | |
| download | webrtc-20b2dc6bfbfc84cbdcbc733314704fdcc5f9f700.tar.gz | |
Fix android_clang build.
BUG=
R=kjellander@webrtc.org, tkchin@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/30879004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@7630 4adac7df-926f-26a2-2b94-8c16560cd09d
| -rw-r--r-- | modules/video_render/android/video_render_android_native_opengl2.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/video_render/android/video_render_android_native_opengl2.h b/modules/video_render/android/video_render_android_native_opengl2.h index 66c53641..f5e5b57e 100644 --- a/modules/video_render/android/video_render_android_native_opengl2.h +++ b/modules/video_render/android/video_render_android_native_opengl2.h @@ -41,7 +41,7 @@ class AndroidNativeOpenGl2Channel: public AndroidStream { virtual void DeliverFrame(JNIEnv* jniEnv); private: - static jint CreateOpenGLNativeStatic( + static jint JNICALL CreateOpenGLNativeStatic( JNIEnv * env, jobject, jlong context, @@ -49,7 +49,7 @@ class AndroidNativeOpenGl2Channel: public AndroidStream { jint height); jint CreateOpenGLNative(int width, int height); - static void DrawNativeStatic(JNIEnv * env,jobject, jlong context); + static void JNICALL DrawNativeStatic(JNIEnv * env,jobject, jlong context); void DrawNative(); uint32_t _id; CriticalSectionWrapper& _renderCritSect; |