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

Side by Side Diff: WATCHLISTS

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 unified diff | Download patch
« no previous file with comments | « PRESUBMIT.py ('k') | talk/media/base/videocommon.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license 3 # Use of this source code is governed by a BSD-style license
4 # that can be found in the LICENSE file in the root of the source 4 # that can be found in the LICENSE file in the root of the source
5 # tree. An additional intellectual property rights grant can be found 5 # tree. An additional intellectual property rights grant can be found
6 # in the file PATENTS. All contributing project authors may 6 # in the file PATENTS. All contributing project authors may
7 # be found in the AUTHORS file in the root of the source tree. 7 # be found in the AUTHORS file in the root of the source tree.
8 8
9 # Inspired by chromium.org: 9 # Inspired by chromium.org:
10 # http://dev.chromium.org/developers/contributing-code/watchlists 10 # http://dev.chromium.org/developers/contributing-code/watchlists
(...skipping 14 matching lines...) Expand all
25 'documented_interfaces': { 25 'documented_interfaces': {
26 'filepath': '^webrtc/[^/]*\.h$|'\ 26 'filepath': '^webrtc/[^/]*\.h$|'\
27 'webrtc/voice_engine/include/.*', 27 'webrtc/voice_engine/include/.*',
28 }, 28 },
29 'build_files': { 29 'build_files': {
30 'filepath': '\.gyp$|\.gypi$|Android\.mk$', 30 'filepath': '\.gyp$|\.gypi$|Android\.mk$',
31 }, 31 },
32 'java_files': { 32 'java_files': {
33 'filepath': '\.java$|\.xml$', 33 'filepath': '\.java$|\.xml$',
34 }, 34 },
35 'video': { 35 'video_engine': {
36 'filepath': 'webrtc/video/.*', 36 'filepath': 'webrtc/video_engine/.*|'\
37 'webrtc/video/.*',
37 }, 38 },
38 'voice_engine': { 39 'voice_engine': {
39 'filepath': 'webrtc/voice_engine/.*', 40 'filepath': 'webrtc/voice_engine/.*',
40 }, 41 },
41 'common_audio': { 42 'common_audio': {
42 'filepath': 'webrtc/common_audio/.*', 43 'filepath': 'webrtc/common_audio/.*',
43 }, 44 },
44 'common_video': { 45 'common_video': {
45 'filepath': 'webrtc/common_video/.*', 46 'filepath': 'webrtc/common_video/.*',
46 }, 47 },
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 'qiang.lu@intel.com', 95 'qiang.lu@intel.com',
95 'yujie.mao@webrtc.org'], 96 'yujie.mao@webrtc.org'],
96 'documented_interfaces': ['interface-changes@webrtc.org', 97 'documented_interfaces': ['interface-changes@webrtc.org',
97 'rwolff@gocast.it'], 98 'rwolff@gocast.it'],
98 'common_audio': ['aluebs@webrtc.org', 99 'common_audio': ['aluebs@webrtc.org',
99 'andrew@webrtc.org', 100 'andrew@webrtc.org',
100 'audio-team@agora.io', 101 'audio-team@agora.io',
101 'bjornv@webrtc.org', 102 'bjornv@webrtc.org',
102 'minyue@webrtc.org', 103 'minyue@webrtc.org',
103 'peah@webrtc.org'], 104 'peah@webrtc.org'],
104 'video': ['andresp@webrtc.org', 105 'video_engine': ['andresp@webrtc.org',
105 'mflodman@webrtc.org', 106 'mflodman@webrtc.org',
106 'pbos@webrtc.org', 107 'perkj@webrtc.org',
107 'perkj@webrtc.org', 108 'solenberg@webrtc.org',
108 'solenberg@webrtc.org', 109 'stefan@webrtc.org',
109 'stefan@webrtc.org', 110 'video-team@agora.io',
110 'video-team@agora.io', 111 'yujie.mao@webrtc.org',
111 'yujie.mao@webrtc.org', 112 'zhengzhonghou@agora.io'],
112 'zhengzhonghou@agora.io'],
113 'voice_engine': ['andrew@webrtc.org', 113 'voice_engine': ['andrew@webrtc.org',
114 'audio-team@agora.io', 114 'audio-team@agora.io',
115 'henrika@webrtc.org', 115 'henrika@webrtc.org',
116 'henrik.lundin@webrtc.org', 116 'henrik.lundin@webrtc.org',
117 'minyue@webrtc.org', 117 'minyue@webrtc.org',
118 'peah@webrtc.org', 118 'peah@webrtc.org',
119 'solenberg@webrtc.org'], 119 'solenberg@webrtc.org'],
120 'video_capture': ['mflodman@webrtc.org', 120 'video_capture': ['mflodman@webrtc.org',
121 'perkj@webrtc.org', 121 'perkj@webrtc.org',
122 'sdk-team@agora.io', 122 'sdk-team@agora.io',
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 'rtp_rtcp': ['mflodman@webrtc.org', 166 'rtp_rtcp': ['mflodman@webrtc.org',
167 'stefan@webrtc.org', 167 'stefan@webrtc.org',
168 'zhuangzesen@agora.io'], 168 'zhuangzesen@agora.io'],
169 'system_wrappers': ['fengyue@agora.io', 169 'system_wrappers': ['fengyue@agora.io',
170 'henrika@webrtc.org', 170 'henrika@webrtc.org',
171 'mflodman@webrtc.org', 171 'mflodman@webrtc.org',
172 'peah@webrtc.org', 172 'peah@webrtc.org',
173 'zhengzhonghou@agora.io'], 173 'zhengzhonghou@agora.io'],
174 }, 174 },
175 } 175 }
OLDNEW
« no previous file with comments | « PRESUBMIT.py ('k') | talk/media/base/videocommon.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698