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

Unified Diff: webrtc/video_engine/vie_sync_module.cc

Issue 1507903005: Revert of Merge webrtc/video_engine/ into webrtc/video/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Resolved merge conflict Created 5 years 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/video_engine/vie_sync_module.h ('k') | webrtc/video_renderer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video_engine/vie_sync_module.cc
diff --git a/webrtc/video/vie_sync_module.cc b/webrtc/video_engine/vie_sync_module.cc
similarity index 98%
rename from webrtc/video/vie_sync_module.cc
rename to webrtc/video_engine/vie_sync_module.cc
index 9ca9a9480e81a8b59b8a61edacb0d2e35879346b..6fe32a7bcbe1f3a23f21f09074a52cd4f0b59670 100644
--- a/webrtc/video/vie_sync_module.cc
+++ b/webrtc/video_engine/vie_sync_module.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/video/vie_sync_module.h"
+#include "webrtc/video_engine/vie_sync_module.h"
#include "webrtc/base/logging.h"
#include "webrtc/base/trace_event.h"
@@ -16,7 +16,7 @@
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
#include "webrtc/modules/video_coding/include/video_coding.h"
#include "webrtc/system_wrappers/include/critical_section_wrapper.h"
-#include "webrtc/video/stream_synchronization.h"
+#include "webrtc/video_engine/stream_synchronization.h"
#include "webrtc/voice_engine/include/voe_video_sync.h"
namespace webrtc {
« no previous file with comments | « webrtc/video_engine/vie_sync_module.h ('k') | webrtc/video_renderer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698