Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(351)

Unified Diff: talk/media/webrtc/webrtcvideocapturerfactory.cc

Issue 1621453005: Fix compilation if HAVE_WEBRTC_VIDEO is not defined. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fixed wrong filename in gyp Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « talk/media/webrtc/webrtcvideocapturer_unittest.cc ('k') | talk/media/webrtc/webrtcvideoengine2_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/media/webrtc/webrtcvideocapturerfactory.cc
diff --git a/talk/media/webrtc/webrtcvideocapturerfactory.cc b/talk/media/webrtc/webrtcvideocapturerfactory.cc
index 9f542bd9c1b15c0e7d767360230f6f9895bd0223..e1466fbba46ffbb54c4ca1d91ff0abfd75c9421c 100755
--- a/talk/media/webrtc/webrtcvideocapturerfactory.cc
+++ b/talk/media/webrtc/webrtcvideocapturerfactory.cc
@@ -32,12 +32,16 @@
namespace cricket {
VideoCapturer* WebRtcVideoDeviceCapturerFactory::Create(const Device& device) {
+#ifdef HAVE_WEBRTC_VIDEO
rtc::scoped_ptr<WebRtcVideoCapturer> capturer(
new WebRtcVideoCapturer());
if (!capturer->Init(device)) {
- return NULL;
+ return nullptr;
}
return capturer.release();
+#else
+ return nullptr;
+#endif
}
} // namespace cricket
« no previous file with comments | « talk/media/webrtc/webrtcvideocapturer_unittest.cc ('k') | talk/media/webrtc/webrtcvideoengine2_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698