webrtc/media/base/videocapturerfactory.h - Issue 1587193006: Move talk/media to webrtc/media

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/media/base/videocapturerfactory.h

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:

Index: webrtc/media/base/videocapturerfactory.h

diff --git a/talk/media/base/videocapturerfactory.h b/webrtc/media/base/videocapturerfactory.h

old mode 100755

new mode 100644

similarity index 88%

rename from talk/media/base/videocapturerfactory.h

rename to webrtc/media/base/videocapturerfactory.h

index 6cb629abf5eb80bd9d4e03d76df08e89c52b441d..e5a98a0028e70a7b2dff5cc819f28c0780745fb6

--- a/talk/media/base/videocapturerfactory.h

+++ b/webrtc/media/base/videocapturerfactory.h

@@ -25,11 +25,11 @@

* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-#ifndef TALK_MEDIA_BASE_VIDEOCAPTURERFACTORY_H_

-#define TALK_MEDIA_BASE_VIDEOCAPTURERFACTORY_H_

+#ifndef WEBRTC_MEDIA_BASE_VIDEOCAPTURERFACTORY_H_

+#define WEBRTC_MEDIA_BASE_VIDEOCAPTURERFACTORY_H_

-#include "talk/media/base/device.h"

-#include "talk/media/base/screencastid.h"

+#include "webrtc/media/base/device.h"

+#include "webrtc/media/base/screencastid.h"

namespace cricket {

@@ -53,4 +53,4 @@ class ScreenCapturerFactory {

} // namespace cricket

-#endif // TALK_MEDIA_BASE_VIDEOCAPTURERFACTORY_H_

+#endif // WEBRTC_MEDIA_BASE_VIDEOCAPTURERFACTORY_H_

« no previous file with comments | « webrtc/media/base/videocapturer_unittest.cc ('k') | webrtc/media/base/videocommon.h » ('j') | no next file with comments »