projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Upstream version 10.39.225.0
[platform/framework/web/crosswalk.git]
/
src
/
third_party
/
webrtc
/
modules
/
video_capture
/
include
/
video_capture_factory.h
diff --git
a/src/third_party/webrtc/modules/video_capture/include/video_capture_factory.h
b/src/third_party/webrtc/modules/video_capture/include/video_capture_factory.h
index
ec92d31
..
f78437d
100644
(file)
--- a/
src/third_party/webrtc/modules/video_capture/include/video_capture_factory.h
+++ b/
src/third_party/webrtc/modules/video_capture/include/video_capture_factory.h
@@
-36,10
+36,6
@@
class VideoCaptureFactory {
static VideoCaptureModule::DeviceInfo* CreateDeviceInfo(
const int32_t id);
-#ifdef WEBRTC_ANDROID
- static int32_t SetAndroidObjects(void* javaVM, void* javaContext);
-#endif
-
private:
~VideoCaptureFactory();
};