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

Side by Side Diff: media/media.gyp

Issue 11418307: Revert 170912 - need more delayloads. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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 | Annotate | Revision Log
« no previous file with comments | « chrome/chrome_dll.gypi ('k') | media/video/capture/win/capability_list_win.h » ('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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 # Override to dynamically link the PulseAudio library. 8 # Override to dynamically link the PulseAudio library.
9 'use_pulseaudio%': 0, 9 'use_pulseaudio%': 0,
10 # Override to dynamically link the cras (ChromeOS audio) library. 10 # Override to dynamically link the cras (ChromeOS audio) library.
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 'video/capture/mac/video_capture_device_mac.mm', 307 'video/capture/mac/video_capture_device_mac.mm',
308 'video/capture/mac/video_capture_device_qtkit_mac.h', 308 'video/capture/mac/video_capture_device_qtkit_mac.h',
309 'video/capture/mac/video_capture_device_qtkit_mac.mm', 309 'video/capture/mac/video_capture_device_qtkit_mac.mm',
310 'video/capture/video_capture.h', 310 'video/capture/video_capture.h',
311 'video/capture/video_capture_device.h', 311 'video/capture/video_capture_device.h',
312 'video/capture/video_capture_device_dummy.cc', 312 'video/capture/video_capture_device_dummy.cc',
313 'video/capture/video_capture_device_dummy.h', 313 'video/capture/video_capture_device_dummy.h',
314 'video/capture/video_capture_proxy.cc', 314 'video/capture/video_capture_proxy.cc',
315 'video/capture/video_capture_proxy.h', 315 'video/capture/video_capture_proxy.h',
316 'video/capture/video_capture_types.h', 316 'video/capture/video_capture_types.h',
317 'video/capture/win/capability_list_win.cc',
318 'video/capture/win/capability_list_win.h',
319 'video/capture/win/filter_base_win.cc', 317 'video/capture/win/filter_base_win.cc',
320 'video/capture/win/filter_base_win.h', 318 'video/capture/win/filter_base_win.h',
321 'video/capture/win/pin_base_win.cc', 319 'video/capture/win/pin_base_win.cc',
322 'video/capture/win/pin_base_win.h', 320 'video/capture/win/pin_base_win.h',
323 'video/capture/win/sink_filter_observer_win.h', 321 'video/capture/win/sink_filter_observer_win.h',
324 'video/capture/win/sink_filter_win.cc', 322 'video/capture/win/sink_filter_win.cc',
325 'video/capture/win/sink_filter_win.h', 323 'video/capture/win/sink_filter_win.h',
326 'video/capture/win/sink_input_pin_win.cc', 324 'video/capture/win/sink_input_pin_win.cc',
327 'video/capture/win/sink_input_pin_win.h', 325 'video/capture/win/sink_input_pin_win.h',
328 'video/capture/win/video_capture_device_mf_win.cc',
329 'video/capture/win/video_capture_device_mf_win.h',
330 'video/capture/win/video_capture_device_win.cc', 326 'video/capture/win/video_capture_device_win.cc',
331 'video/capture/win/video_capture_device_win.h', 327 'video/capture/win/video_capture_device_win.h',
332 'video/picture.cc', 328 'video/picture.cc',
333 'video/picture.h', 329 'video/picture.h',
334 'video/video_decode_accelerator.cc', 330 'video/video_decode_accelerator.cc',
335 'video/video_decode_accelerator.h', 331 'video/video_decode_accelerator.h',
336 'webm/webm_cluster_parser.cc', 332 'webm/webm_cluster_parser.cc',
337 'webm/webm_cluster_parser.h', 333 'webm/webm_cluster_parser.h',
338 'webm/webm_constants.h', 334 'webm/webm_constants.h',
339 'webm/webm_content_encodings.cc', 335 'webm/webm_content_encodings.cc',
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
553 ], 549 ],
554 }, 550 },
555 }], 551 }],
556 ['OS=="win"', { 552 ['OS=="win"', {
557 'sources!': [ 553 'sources!': [
558 'audio/pulse/pulse_output.cc', 554 'audio/pulse/pulse_output.cc',
559 'audio/pulse/pulse_output.h', 555 'audio/pulse/pulse_output.h',
560 'video/capture/video_capture_device_dummy.cc', 556 'video/capture/video_capture_device_dummy.cc',
561 'video/capture/video_capture_device_dummy.h', 557 'video/capture/video_capture_device_dummy.h',
562 ], 558 ],
563 'link_settings': {
564 'libraries': [
565 '-lmf.lib',
566 '-lmfplat.lib',
567 '-lmfreadwrite.lib',
568 '-lmfuuid.lib',
569 ],
570 },
571 'msvs_settings': {
572 'VCLinkerTool': {
573 'DelayLoadDLLs': [
574 'mf.dll',
575 'mfplat.dll',
576 'mfreadwrite.dll',
577 ],
578 },
579 },
580 }], 559 }],
581 ['proprietary_codecs==1 or branding=="Chrome"', { 560 ['proprietary_codecs==1 or branding=="Chrome"', {
582 'sources': [ 561 'sources': [
583 'mp4/aac.cc', 562 'mp4/aac.cc',
584 'mp4/aac.h', 563 'mp4/aac.h',
585 'mp4/avc.cc', 564 'mp4/avc.cc',
586 'mp4/avc.h', 565 'mp4/avc.h',
587 'mp4/box_definitions.cc', 566 'mp4/box_definitions.cc',
588 'mp4/box_definitions.h', 567 'mp4/box_definitions.h',
589 'mp4/box_reader.cc', 568 'mp4/box_reader.cc',
(...skipping 741 matching lines...) Expand 10 before | Expand all | Expand 10 after
1331 'media', 1310 'media',
1332 ], 1311 ],
1333 'sources': [ 1312 'sources': [
1334 'tools/media_bench/media_bench.cc', 1313 'tools/media_bench/media_bench.cc',
1335 ], 1314 ],
1336 }, 1315 },
1337 ], 1316 ],
1338 }] 1317 }]
1339 ], 1318 ],
1340 } 1319 }
OLDNEW
« no previous file with comments | « chrome/chrome_dll.gypi ('k') | media/video/capture/win/capability_list_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698