Merge webrtc/video_engine/ into webrtc/video/

WATCHLISTS

 # Copyright (c) 2011 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.
 
 # Inspired by chromium.org:
 # http://dev.chromium.org/developers/contributing-code/watchlists
@@ skipping 14 matching lines @@
     'documented_interfaces': {
       'filepath': '^webrtc/[^/]*\.h$|'\
                   'webrtc/voice_engine/include/.*',
     },
     'build_files': {
       'filepath': '\.gyp$|\.gypi$|Android\.mk$',
     },
     'java_files': {
       'filepath': '\.java$|\.xml$',
     },
-    'video_engine': {
-      'filepath': 'webrtc/video_engine/.*|'\
-                  'webrtc/video/.*',
+    'video': {
+      'filepath': 'webrtc/video/.*',
     },
     'voice_engine': {
       'filepath': 'webrtc/voice_engine/.*',
     },
     'common_audio': {
       'filepath': 'webrtc/common_audio/.*',
     },
     'common_video': {
       'filepath': 'webrtc/common_video/.*',
     },
@@ skipping 47 matching lines @@
                    'qiang.lu@intel.com',
                    'yujie.mao@webrtc.org'],
     'documented_interfaces': ['interface-changes@webrtc.org',
                               'rwolff@gocast.it'],
     'common_audio': ['aluebs@webrtc.org',
                      'andrew@webrtc.org',
                      'audio-team@agora.io',
                      'bjornv@webrtc.org',
                      'minyue@webrtc.org',
                      'peah@webrtc.org'],
-    'video_engine': ['andresp@webrtc.org',
-                     'mflodman@webrtc.org',
-                     'perkj@webrtc.org',
-                     'solenberg@webrtc.org',
-                     'stefan@webrtc.org',
-                     'video-team@agora.io',
-                     'yujie.mao@webrtc.org',
-                     'zhengzhonghou@agora.io'],
+    'video': ['andresp@webrtc.org',
+              'mflodman@webrtc.org',
+              'pbos@webrtc.org',
+              'perkj@webrtc.org',
+              'solenberg@webrtc.org',
+              'stefan@webrtc.org',
+              'video-team@agora.io',
+              'yujie.mao@webrtc.org',
+              'zhengzhonghou@agora.io'],
     'voice_engine': ['andrew@webrtc.org',
                      'audio-team@agora.io',
                      'henrika@webrtc.org',
                      'henrik.lundin@webrtc.org',
                      'minyue@webrtc.org',
                      'peah@webrtc.org',
                      'solenberg@webrtc.org'],
     'video_capture': ['mflodman@webrtc.org',
                       'perkj@webrtc.org',
                       'sdk-team@agora.io',
@@ skipping 43 matching lines @@
     'rtp_rtcp': ['mflodman@webrtc.org',
                  'stefan@webrtc.org',
                  'zhuangzesen@agora.io'],
     'system_wrappers': ['fengyue@agora.io',
                         'henrika@webrtc.org',
                         'mflodman@webrtc.org',
                         'peah@webrtc.org',
                         'zhengzhonghou@agora.io'],
   },
 }