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

Unified Diff: webrtc/media/webrtc/webrtcvideoengine2.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/media/webrtc/webrtcvideoencoderfactory.h ('k') | webrtc/media/webrtc/webrtcvideoengine2.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/webrtc/webrtcvideoengine2.h
diff --git a/talk/media/webrtc/webrtcvideoengine2.h b/webrtc/media/webrtc/webrtcvideoengine2.h
similarity index 98%
rename from talk/media/webrtc/webrtcvideoengine2.h
rename to webrtc/media/webrtc/webrtcvideoengine2.h
index 7881905fd589104a9a3a661e06473697a69ead73..70caef1e1cf46367707c4b67fd8305a5e74fd27f 100644
--- a/talk/media/webrtc/webrtcvideoengine2.h
+++ b/webrtc/media/webrtc/webrtcvideoengine2.h
@@ -25,23 +25,23 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef TALK_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_
-#define TALK_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_
+#ifndef WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_
+#define WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_
#include <map>
#include <string>
#include <vector>
-#include "talk/media/base/mediaengine.h"
-#include "talk/media/webrtc/webrtcvideochannelfactory.h"
-#include "talk/media/webrtc/webrtcvideodecoderfactory.h"
-#include "talk/media/webrtc/webrtcvideoencoderfactory.h"
#include "webrtc/base/criticalsection.h"
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/base/thread_annotations.h"
#include "webrtc/base/thread_checker.h"
#include "webrtc/media/base/videosinkinterface.h"
#include "webrtc/call.h"
+#include "webrtc/media/base/mediaengine.h"
+#include "webrtc/media/webrtc/webrtcvideochannelfactory.h"
+#include "webrtc/media/webrtc/webrtcvideodecoderfactory.h"
+#include "webrtc/media/webrtc/webrtcvideoencoderfactory.h"
#include "webrtc/transport.h"
#include "webrtc/video_frame.h"
#include "webrtc/video_receive_stream.h"
@@ -528,4 +528,4 @@ class WebRtcVideoChannel2 : public VideoMediaChannel,
} // namespace cricket
-#endif // TALK_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_
+#endif // WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_
« no previous file with comments | « webrtc/media/webrtc/webrtcvideoencoderfactory.h ('k') | webrtc/media/webrtc/webrtcvideoengine2.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698