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

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

Issue 1587193006: Move talk/media to webrtc/media (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased to b647aca12a884a13c1728118586245399b55fa3d (#11493) Created 4 years, 10 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 | « webrtc/media/webrtc/webrtcvideocapturerfactory.h ('k') | webrtc/media/webrtc/webrtcvideochannelfactory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/webrtc/webrtcvideocapturerfactory.cc
diff --git a/talk/media/webrtc/webrtcvideocapturerfactory.cc b/webrtc/media/webrtc/webrtcvideocapturerfactory.cc
old mode 100755
new mode 100644
similarity index 92%
rename from talk/media/webrtc/webrtcvideocapturerfactory.cc
rename to webrtc/media/webrtc/webrtcvideocapturerfactory.cc
index e1466fbba46ffbb54c4ca1d91ff0abfd75c9421c..9717e0d124e1653b396be69592a66f99766c7f73
--- a/talk/media/webrtc/webrtcvideocapturerfactory.cc
+++ b/webrtc/media/webrtc/webrtcvideocapturerfactory.cc
@@ -1,6 +1,6 @@
/*
* libjingle
- * Copyright 2014 Google Inc.
+ * Copyright 2004 Google Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
@@ -25,9 +25,9 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "talk/media/webrtc/webrtcvideocapturer.h"
-#include "talk/media/webrtc/webrtcvideocapturerfactory.h"
#include "webrtc/base/scoped_ptr.h"
+#include "webrtc/media/webrtc/webrtcvideocapturer.h"
+#include "webrtc/media/webrtc/webrtcvideocapturerfactory.h"
namespace cricket {
« no previous file with comments | « webrtc/media/webrtc/webrtcvideocapturerfactory.h ('k') | webrtc/media/webrtc/webrtcvideochannelfactory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698