admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace ANDROID with WEBRTC_ANDROID [video capture]

Browse Source 
Review URL: http://webrtc-codereview.appspot.com/99001

git-svn-id: http://webrtc.googlecode.com/svn/trunk@297 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
leozwang@google.com 2011-08-03 21:37:33 +00:00
parent 808e0e0dac
commit 094434fd33
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/video_capture/main/source/video_capture_impl.cc
View File

@ -16,7 +16,7 @@
#include "video_capture_config.h"
#include "module_common_types.h"
#ifdef ANDROID
#ifdef WEBRTC_ANDROID
#include "video_capture_android.h" // Need inclusion here to set Java environment.
#endif
@ -38,7 +38,7 @@ void VideoCaptureModule::Destroy(VideoCaptureModule* module)
delete module;
}
#ifdef ANDROID
#ifdef WEBRTC_ANDROID
WebRtc_Word32 VideoCaptureModule::SetAndroidObjects(void* javaVM,void* javaContext)
{
WEBRTC_TRACE(webrtc::kTraceModuleCall, webrtc::kTraceVideoCapture, 0, "SetAndroidObjects");