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

Side by Side Diff: webrtc/media/media.gyp

Issue 2383093002: Delete all use of cricket::VideoFrame and cricket::WebRtcVideoFrame. (Closed)
Patch Set: Deleted a newline. Created 4 years, 1 month 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
OLDNEW
1 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2016 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 { 9 {
10 'includes': [ '../build/common.gypi', ], 10 'includes': [ '../build/common.gypi', ],
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 }], 125 }],
126 ['build_with_chromium==1', { 126 ['build_with_chromium==1', {
127 'dependencies': [ 127 'dependencies': [
128 '<(webrtc_root)/modules/modules.gyp:video_capture', 128 '<(webrtc_root)/modules/modules.gyp:video_capture',
129 ], 129 ],
130 }, { 130 }, {
131 'defines': [ 131 'defines': [
132 'HAVE_WEBRTC_VIDEO', 132 'HAVE_WEBRTC_VIDEO',
133 'HAVE_WEBRTC_VOICE', 133 'HAVE_WEBRTC_VOICE',
134 ], 134 ],
135 'direct_dependent_settings': { 135 'all_dependent_settings': {
perkj_webrtc 2016/10/25 10:53:36 why is this needed? There is no change made to B
nisse-webrtc 2016/10/25 11:21:01 Ooops, left over change. Probably needed for some
136 'defines': [ 136 'defines': [
137 'HAVE_WEBRTC_VIDEO', 137 'HAVE_WEBRTC_VIDEO',
138 'HAVE_WEBRTC_VOICE', 138 'HAVE_WEBRTC_VOICE',
139 ], 139 ],
140 }, 140 },
141 'dependencies': [ 141 'dependencies': [
142 '<(webrtc_root)/modules/modules.gyp:video_capture_module_internal_im pl', 142 '<(webrtc_root)/modules/modules.gyp:video_capture_module_internal_im pl',
143 ], 143 ],
144 }], 144 }],
145 ['OS=="linux" and use_gtk==1', { 145 ['OS=="linux" and use_gtk==1', {
(...skipping 17 matching lines...) Expand all
163 'gdi32.lib', 163 'gdi32.lib',
164 'strmiids.lib', 164 'strmiids.lib',
165 ], 165 ],
166 }, 166 },
167 }, 167 },
168 }], 168 }],
169 ], 169 ],
170 }, # target rtc_media 170 }, # target rtc_media
171 ], # targets. 171 ], # targets.
172 } 172 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698