Merge webrtc/video_engine/ into webrtc/video/

webrtc/video/vie_sync_module.cc

Index: webrtc/video/vie_sync_module.cc
diff --git a/webrtc/video_engine/vie_sync_module.cc b/webrtc/video/vie_sync_module.cc
similarity index 98%
rename from webrtc/video_engine/vie_sync_module.cc
rename to webrtc/video/vie_sync_module.cc
index 6fe32a7bcbe1f3a23f21f09074a52cd4f0b59670..9ca9a9480e81a8b59b8a61edacb0d2e35879346b 100644
--- a/webrtc/video_engine/vie_sync_module.cc
+++ b/webrtc/video/vie_sync_module.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/video_engine/vie_sync_module.h"
+#include "webrtc/video/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_engine/stream_synchronization.h"
+#include "webrtc/video/stream_synchronization.h"
 #include "webrtc/voice_engine/include/voe_video_sync.h"
 
 namespace webrtc {