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

Side by Side Diff: media/media.gyp

Issue 21421002: Revert EVS revisions 209760, 298753, 213143. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased at 216225, prepare to land Created 7 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/base/encoded_bitstream_buffer.cc ('k') | media/video/encoded_video_source.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 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 'base/decryptor.cc', 250 'base/decryptor.cc',
251 'base/decryptor.h', 251 'base/decryptor.h',
252 'base/decrypt_config.cc', 252 'base/decrypt_config.cc',
253 'base/decrypt_config.h', 253 'base/decrypt_config.h',
254 'base/demuxer.cc', 254 'base/demuxer.cc',
255 'base/demuxer.h', 255 'base/demuxer.h',
256 'base/demuxer_stream.cc', 256 'base/demuxer_stream.cc',
257 'base/demuxer_stream.h', 257 'base/demuxer_stream.h',
258 'base/djb2.cc', 258 'base/djb2.cc',
259 'base/djb2.h', 259 'base/djb2.h',
260 'base/encoded_bitstream_buffer.cc',
261 'base/encoded_bitstream_buffer.h',
262 'base/filter_collection.cc', 260 'base/filter_collection.cc',
263 'base/filter_collection.h', 261 'base/filter_collection.h',
264 'base/media.cc', 262 'base/media.cc',
265 'base/media.h', 263 'base/media.h',
266 'base/media_keys.cc', 264 'base/media_keys.cc',
267 'base/media_keys.h', 265 'base/media_keys.h',
268 'base/media_log.cc', 266 'base/media_log.cc',
269 'base/media_log.h', 267 'base/media_log.h',
270 'base/media_log_event.h', 268 'base/media_log_event.h',
271 'base/media_posix.cc', 269 'base/media_posix.cc',
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
405 'video/capture/win/pin_base_win.h', 403 'video/capture/win/pin_base_win.h',
406 'video/capture/win/sink_filter_observer_win.h', 404 'video/capture/win/sink_filter_observer_win.h',
407 'video/capture/win/sink_filter_win.cc', 405 'video/capture/win/sink_filter_win.cc',
408 'video/capture/win/sink_filter_win.h', 406 'video/capture/win/sink_filter_win.h',
409 'video/capture/win/sink_input_pin_win.cc', 407 'video/capture/win/sink_input_pin_win.cc',
410 'video/capture/win/sink_input_pin_win.h', 408 'video/capture/win/sink_input_pin_win.h',
411 'video/capture/win/video_capture_device_mf_win.cc', 409 'video/capture/win/video_capture_device_mf_win.cc',
412 'video/capture/win/video_capture_device_mf_win.h', 410 'video/capture/win/video_capture_device_mf_win.h',
413 'video/capture/win/video_capture_device_win.cc', 411 'video/capture/win/video_capture_device_win.cc',
414 'video/capture/win/video_capture_device_win.h', 412 'video/capture/win/video_capture_device_win.h',
415 'video/encoded_video_source.h',
416 'video/picture.cc', 413 'video/picture.cc',
417 'video/picture.h', 414 'video/picture.h',
418 'video/video_decode_accelerator.cc', 415 'video/video_decode_accelerator.cc',
419 'video/video_decode_accelerator.h', 416 'video/video_decode_accelerator.h',
420 'video/video_encode_types.h',
421 'webm/webm_audio_client.cc', 417 'webm/webm_audio_client.cc',
422 'webm/webm_audio_client.h', 418 'webm/webm_audio_client.h',
423 'webm/webm_cluster_parser.cc', 419 'webm/webm_cluster_parser.cc',
424 'webm/webm_cluster_parser.h', 420 'webm/webm_cluster_parser.h',
425 'webm/webm_constants.cc', 421 'webm/webm_constants.cc',
426 'webm/webm_constants.h', 422 'webm/webm_constants.h',
427 'webm/webm_content_encodings.cc', 423 'webm/webm_content_encodings.cc',
428 'webm/webm_content_encodings.h', 424 'webm/webm_content_encodings.h',
429 'webm/webm_content_encodings_client.cc', 425 'webm/webm_content_encodings_client.cc',
430 'webm/webm_content_encodings_client.h', 426 'webm/webm_content_encodings_client.h',
(...skipping 1203 matching lines...) Expand 10 before | Expand all | Expand 10 after
1634 'sources': [ 1630 'sources': [
1635 'tools/media_bench/media_bench.cc', 1631 'tools/media_bench/media_bench.cc',
1636 ], 1632 ],
1637 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 1633 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
1638 'msvs_disabled_warnings': [ 4267, ], 1634 'msvs_disabled_warnings': [ 4267, ],
1639 }, 1635 },
1640 ], 1636 ],
1641 }], 1637 }],
1642 ], 1638 ],
1643 } 1639 }
OLDNEW
« no previous file with comments | « media/base/encoded_bitstream_buffer.cc ('k') | media/video/encoded_video_source.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698