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

Side by Side Diff: media/media.gyp

Issue 165163: Merge 21882 - Implemented a proper clock for audio/video synchronization.... (Closed) Base URL: svn://chrome-svn/chrome/branches/195/src/
Patch Set: Created 11 years, 4 months 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 | Annotate | Revision Log
« no previous file with comments | « media/filters/video_renderer_base.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Modified: svn:mergeinfo
Merged /trunk/src/media/media.gyp:r21882
OLDNEW
1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 '../build/common.gypi', 10 '../build/common.gypi',
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 'audio/mac/audio_output_mac.h', 44 'audio/mac/audio_output_mac.h',
45 'audio/simple_sources.cc', 45 'audio/simple_sources.cc',
46 'audio/simple_sources.h', 46 'audio/simple_sources.h',
47 'audio/win/audio_manager_win.h', 47 'audio/win/audio_manager_win.h',
48 'audio/win/audio_output_win.cc', 48 'audio/win/audio_output_win.cc',
49 'audio/win/waveout_output_win.cc', 49 'audio/win/waveout_output_win.cc',
50 'audio/win/waveout_output_win.h', 50 'audio/win/waveout_output_win.h',
51 'base/buffer_queue.h', 51 'base/buffer_queue.h',
52 'base/buffer_queue.cc', 52 'base/buffer_queue.cc',
53 'base/buffers.h', 53 'base/buffers.h',
54 'base/clock.h',
55 'base/clock_impl.cc',
56 'base/clock_impl.h',
54 'base/data_buffer.cc', 57 'base/data_buffer.cc',
55 'base/data_buffer.h', 58 'base/data_buffer.h',
56 'base/factory.h', 59 'base/factory.h',
57 'base/filter_host.h', 60 'base/filter_host.h',
58 'base/filters.h', 61 'base/filters.h',
59 'base/media_posix.cc', 62 'base/media_posix.cc',
60 'base/media_win.cc', 63 'base/media_win.cc',
61 'base/media.h', 64 'base/media.h',
62 'base/media_format.cc', 65 'base/media_format.cc',
63 'base/media_format.h', 66 'base/media_format.h',
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 '../testing/gmock.gyp:gmock', 150 '../testing/gmock.gyp:gmock',
148 '../testing/gtest.gyp:gtest', 151 '../testing/gtest.gyp:gtest',
149 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', 152 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
150 ], 153 ],
151 'sources': [ 154 'sources': [
152 'audio/audio_util_unittest.cc', 155 'audio/audio_util_unittest.cc',
153 'audio/mac/audio_output_mac_unittest.cc', 156 'audio/mac/audio_output_mac_unittest.cc',
154 'audio/simple_sources_unittest.cc', 157 'audio/simple_sources_unittest.cc',
155 'audio/win/audio_output_win_unittest.cc', 158 'audio/win/audio_output_win_unittest.cc',
156 'base/buffer_queue_unittest.cc', 159 'base/buffer_queue_unittest.cc',
160 'base/clock_impl_unittest.cc',
157 'base/data_buffer_unittest.cc', 161 'base/data_buffer_unittest.cc',
158 'base/mock_ffmpeg.cc', 162 'base/mock_ffmpeg.cc',
159 'base/mock_ffmpeg.h', 163 'base/mock_ffmpeg.h',
160 'base/mock_filter_host.h', 164 'base/mock_filter_host.h',
161 'base/mock_filters.cc', 165 'base/mock_filters.cc',
162 'base/mock_filters.h', 166 'base/mock_filters.h',
163 'base/mock_reader.h', 167 'base/mock_reader.h',
164 'base/pipeline_impl_unittest.cc', 168 'base/pipeline_impl_unittest.cc',
165 'base/run_all_unittests.cc', 169 'base/run_all_unittests.cc',
166 'base/seekable_buffer_unittest.cc', 170 'base/seekable_buffer_unittest.cc',
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 'msvs_settings': { 244 'msvs_settings': {
241 'VCLinkerTool': { 245 'VCLinkerTool': {
242 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 246 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
243 }, 247 },
244 }, 248 },
245 }, 249 },
246 ], 250 ],
247 }], 251 }],
248 ], 252 ],
249 } 253 }
OLDNEW
« no previous file with comments | « media/filters/video_renderer_base.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698