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

Side by Side Diff: media/media.gyp

Issue 518313003: Move Mac media glue code from media/video/capture/mac to media/base/mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sort header includes by path. Created 6 years, 3 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/base/mac/coremedia_glue.mm ('k') | media/video/capture/mac/avfoundation_glue.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 cras (ChromeOS audio) library. 8 # Override to dynamically link the cras (ChromeOS audio) library.
9 'use_cras%': 0, 9 'use_cras%': 0,
10 # Option e.g. for Linux distributions to link pulseaudio directly 10 # Option e.g. for Linux distributions to link pulseaudio directly
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 'base/decryptor.cc', 274 'base/decryptor.cc',
275 'base/decryptor.h', 275 'base/decryptor.h',
276 'base/demuxer.cc', 276 'base/demuxer.cc',
277 'base/demuxer.h', 277 'base/demuxer.h',
278 'base/demuxer_stream.cc', 278 'base/demuxer_stream.cc',
279 'base/demuxer_stream.h', 279 'base/demuxer_stream.h',
280 'base/djb2.cc', 280 'base/djb2.cc',
281 'base/djb2.h', 281 'base/djb2.h',
282 'base/keyboard_event_counter.cc', 282 'base/keyboard_event_counter.cc',
283 'base/keyboard_event_counter.h', 283 'base/keyboard_event_counter.h',
284 'base/mac/avfoundation_glue.h',
285 'base/mac/avfoundation_glue.mm',
286 'base/mac/coremedia_glue.h',
287 'base/mac/coremedia_glue.mm',
284 'base/media.cc', 288 'base/media.cc',
285 'base/media.h', 289 'base/media.h',
286 'base/media_file_checker.cc', 290 'base/media_file_checker.cc',
287 'base/media_file_checker.h', 291 'base/media_file_checker.h',
288 'base/media_keys.cc', 292 'base/media_keys.cc',
289 'base/media_keys.h', 293 'base/media_keys.h',
290 'base/media_log.cc', 294 'base/media_log.cc',
291 'base/media_log.h', 295 'base/media_log.h',
292 'base/media_log_event.h', 296 'base/media_log_event.h',
293 'base/media_posix.cc', 297 'base/media_posix.cc',
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
483 'video/capture/file_video_capture_device.cc', 487 'video/capture/file_video_capture_device.cc',
484 'video/capture/file_video_capture_device.h', 488 'video/capture/file_video_capture_device.h',
485 'video/capture/file_video_capture_device_factory.h', 489 'video/capture/file_video_capture_device_factory.h',
486 'video/capture/file_video_capture_device_factory.cc', 490 'video/capture/file_video_capture_device_factory.cc',
487 'video/capture/linux/video_capture_device_factory_linux.cc', 491 'video/capture/linux/video_capture_device_factory_linux.cc',
488 'video/capture/linux/video_capture_device_factory_linux.h', 492 'video/capture/linux/video_capture_device_factory_linux.h',
489 'video/capture/linux/video_capture_device_linux.cc', 493 'video/capture/linux/video_capture_device_linux.cc',
490 'video/capture/linux/video_capture_device_linux.h', 494 'video/capture/linux/video_capture_device_linux.h',
491 'video/capture/linux/video_capture_device_chromeos.cc', 495 'video/capture/linux/video_capture_device_chromeos.cc',
492 'video/capture/linux/video_capture_device_chromeos.h', 496 'video/capture/linux/video_capture_device_chromeos.h',
493 'video/capture/mac/avfoundation_glue.h',
494 'video/capture/mac/avfoundation_glue.mm',
495 'video/capture/mac/coremedia_glue.h',
496 'video/capture/mac/coremedia_glue.mm',
497 'video/capture/mac/platform_video_capturing_mac.h', 497 'video/capture/mac/platform_video_capturing_mac.h',
498 'video/capture/mac/video_capture_device_avfoundation_mac.h', 498 'video/capture/mac/video_capture_device_avfoundation_mac.h',
499 'video/capture/mac/video_capture_device_avfoundation_mac.mm', 499 'video/capture/mac/video_capture_device_avfoundation_mac.mm',
500 'video/capture/mac/video_capture_device_factory_mac.h', 500 'video/capture/mac/video_capture_device_factory_mac.h',
501 'video/capture/mac/video_capture_device_factory_mac.mm', 501 'video/capture/mac/video_capture_device_factory_mac.mm',
502 'video/capture/mac/video_capture_device_mac.h', 502 'video/capture/mac/video_capture_device_mac.h',
503 'video/capture/mac/video_capture_device_mac.mm', 503 'video/capture/mac/video_capture_device_mac.mm',
504 'video/capture/mac/video_capture_device_qtkit_mac.h', 504 'video/capture/mac/video_capture_device_qtkit_mac.h',
505 'video/capture/mac/video_capture_device_qtkit_mac.mm', 505 'video/capture/mac/video_capture_device_qtkit_mac.mm',
506 'video/capture/video_capture_device.cc', 506 'video/capture/video_capture_device.cc',
(...skipping 1219 matching lines...) Expand 10 before | Expand all | Expand 10 after
1726 ], 1726 ],
1727 }], 1727 }],
1728 ], 1728 ],
1729 }], 1729 }],
1730 ], 1730 ],
1731 }, 1731 },
1732 ], 1732 ],
1733 }], 1733 }],
1734 ], 1734 ],
1735 } 1735 }
OLDNEW
« no previous file with comments | « media/base/mac/coremedia_glue.mm ('k') | media/video/capture/mac/avfoundation_glue.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698