Merge webrtc/video_engine/ into webrtc/video/

webrtc/video/stream_synchronization.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/video_engine/stream_synchronization.h"
+#include "webrtc/video/stream_synchronization.h"
 
 #include <assert.h>
 #include <math.h>
 #include <stdlib.h>
 
 #include <algorithm>
 
 #include "webrtc/base/logging.h"
 
 namespace webrtc {
@@ skipping 195 matching lines @@
       target_delay_ms - base_target_delay_ms_;
 
   channel_delay_->extra_video_delay_ms +=
       target_delay_ms - base_target_delay_ms_;
 
   // Video is already delayed by the desired amount.
   base_target_delay_ms_ = target_delay_ms;
 }
 
 }  // namespace webrtc