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: ffmpeg.gyp

Issue 8226030: Cleanup: no need to redeclare use_system_yasm. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/ffmpeg/source/
Patch Set: Created 9 years, 2 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 | « no previous file | 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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 # There's a couple key GYP variables that control how FFmpeg is built: 5 # There's a couple key GYP variables that control how FFmpeg is built:
6 # ffmpeg_branding 6 # ffmpeg_branding
7 # Controls whether we build the Chromium or Google Chrome version of 7 # Controls whether we build the Chromium or Google Chrome version of
8 # FFmpeg. The Google Chrome version contains additional codecs. 8 # FFmpeg. The Google Chrome version contains additional codecs.
9 # Typical values are Chromium, Chrome, ChromiumOS, and ChromeOS. 9 # Typical values are Chromium, Chrome, ChromiumOS, and ChromeOS.
10 # use_system_ffmpeg 10 # use_system_ffmpeg
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 ['chromeos==1', { 59 ['chromeos==1', {
60 'ffmpeg_branding%': '<(branding)OS', 60 'ffmpeg_branding%': '<(branding)OS',
61 }, { # otherwise, assume Chrome/Chromium. 61 }, { # otherwise, assume Chrome/Chromium.
62 'ffmpeg_branding%': '<(branding)', 62 'ffmpeg_branding%': '<(branding)',
63 }], 63 }],
64 ], 64 ],
65 65
66 'ffmpeg_variant%': '<(target_arch)', 66 'ffmpeg_variant%': '<(target_arch)',
67 67
68 'use_system_ffmpeg%': 0, 68 'use_system_ffmpeg%': 0,
69 'use_system_yasm%': 0,
70 'build_ffmpegsumo%': 1, 69 'build_ffmpegsumo%': 1,
71 70
72 # Locations for generated artifacts. 71 # Locations for generated artifacts.
73 'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/ffmpeg', 72 'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/ffmpeg',
74 'asm_library': 'ffmpegasm', 73 'asm_library': 'ffmpegasm',
75 }, 74 },
76 'conditions': [ 75 'conditions': [
77 ['OS!="win" and use_system_ffmpeg==0 and build_ffmpegsumo!=0', { 76 ['OS!="win" and use_system_ffmpeg==0 and build_ffmpegsumo!=0', {
78 'targets': [ 77 'targets': [
79 { 78 {
(...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after
528 ], # conditions 527 ], # conditions
529 }, 528 },
530 ], # targets 529 ], # targets
531 } 530 }
532 531
533 # Local Variables: 532 # Local Variables:
534 # tab-width:2 533 # tab-width:2
535 # indent-tabs-mode:nil 534 # indent-tabs-mode:nil
536 # End: 535 # End:
537 # vim: set expandtab tabstop=2 shiftwidth=2: 536 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698