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

Side by Side Diff: media/media.gyp

Issue 149366: Updated FFmpegDemuxerTest and FFmpegVideoDecoderTest to use the gmock-based MockFilterHost. (Closed)
Patch Set: Fixed break Created 11 years, 5 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
« no previous file with comments | « media/filters/ffmpeg_video_decoder_unittest.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')
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 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 'audio/win/audio_output_win_unittest.cc', 152 'audio/win/audio_output_win_unittest.cc',
153 'audio/mac/audio_output_mac_unittest.cc', 153 'audio/mac/audio_output_mac_unittest.cc',
154 'audio/simple_sources_unittest.cc', 154 'audio/simple_sources_unittest.cc',
155 'base/buffer_queue_unittest.cc', 155 'base/buffer_queue_unittest.cc',
156 'base/data_buffer_unittest.cc', 156 'base/data_buffer_unittest.cc',
157 'base/mock_ffmpeg.cc', 157 'base/mock_ffmpeg.cc',
158 'base/mock_ffmpeg.h', 158 'base/mock_ffmpeg.h',
159 'base/mock_filter_host.h', 159 'base/mock_filter_host.h',
160 'base/mock_filters.h', 160 'base/mock_filters.h',
161 'base/mock_media_filters.h', 161 'base/mock_media_filters.h',
162 'base/mock_pipeline.h',
163 'base/mock_reader.h', 162 'base/mock_reader.h',
164 'base/pipeline_impl_unittest.cc', 163 'base/pipeline_impl_unittest.cc',
165 'base/run_all_unittests.cc', 164 'base/run_all_unittests.cc',
166 'base/seekable_buffer_unittest.cc', 165 'base/seekable_buffer_unittest.cc',
167 'base/video_frame_impl_unittest.cc', 166 'base/video_frame_impl_unittest.cc',
168 'base/yuv_convert_unittest.cc', 167 'base/yuv_convert_unittest.cc',
169 'filters/ffmpeg_demuxer_unittest.cc', 168 'filters/ffmpeg_demuxer_unittest.cc',
170 'filters/ffmpeg_glue_unittest.cc', 169 'filters/ffmpeg_glue_unittest.cc',
171 'filters/ffmpeg_video_decoder_unittest.cc', 170 'filters/ffmpeg_video_decoder_unittest.cc',
172 'filters/file_data_source_unittest.cc', 171 'filters/file_data_source_unittest.cc',
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 'msvs_settings': { 237 'msvs_settings': {
239 'VCLinkerTool': { 238 'VCLinkerTool': {
240 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 239 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
241 }, 240 },
242 }, 241 },
243 }, 242 },
244 ], 243 ],
245 }], 244 }],
246 ], 245 ],
247 } 246 }
OLDNEW
« no previous file with comments | « media/filters/ffmpeg_video_decoder_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698