webrtc/media/base/mediaengine.cc - 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/mediaengine.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:

Index: webrtc/media/base/mediaengine.cc

diff --git a/talk/media/base/mediaengine.cc b/webrtc/media/base/mediaengine.cc

similarity index 95%

rename from talk/media/base/mediaengine.cc

rename to webrtc/media/base/mediaengine.cc

index 9be590c2fc4ce445d6683bfac7a0f97f4ae3b68a..32d6d92d8b902cc42e5f92b35e5bc81a166e97fc 100644

--- a/talk/media/base/mediaengine.cc

+++ b/webrtc/media/base/mediaengine.cc

@@ -25,12 +25,12 @@

* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

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

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

#if !defined(DISABLE_MEDIA_ENGINE_FACTORY)

#if defined(HAVE_WEBRTC_VOICE) && defined(HAVE_WEBRTC_VIDEO)

-#include "talk/media/webrtc/webrtcmediaengine.h"

+#include "webrtc/media/webrtc/webrtcmediaengine.h"

#endif // HAVE_WEBRTC_VOICE && HAVE_WEBRTC_VIDEO

#ifdef HAVE_CONFIG_H

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