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

Side by Side Diff: ffmpeg.gyp

Issue 9370003: Remove pthreads patch, roll in new patches, disable unchecked bit readers. (Closed) Base URL: ssh://gerrit.chromium.org:29418/chromium/third_party/ffmpeg.git@master
Patch Set: gyp fix. Created 8 years, 10 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
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 429 matching lines...) Expand 10 before | Expand all | Expand 10 after
440 '-i', '<(intermediate_dir)', 440 '-i', '<(intermediate_dir)',
441 '-o', '<(output_dir)', 441 '-o', '<(output_dir)',
442 '-t', '<(outfile_type)', 442 '-t', '<(outfile_type)',
443 '<@(RULE_INPUT_PATH)', 443 '<@(RULE_INPUT_PATH)',
444 ], 444 ],
445 'message': 'Generating FFmpeg import libraries.', 445 'message': 'Generating FFmpeg import libraries.',
446 }, 446 },
447 ], 447 ],
448 448
449 # Copy prebuilt binaries to build directory. 449 # Copy prebuilt binaries to build directory.
450 'dependencies': ['../../build/win/system.gyp:cygwin'],
451 'copies': [{ 450 'copies': [{
452 'destination': '<(PRODUCT_DIR)/', 451 'destination': '<(PRODUCT_DIR)/',
453 'files': [ 452 'files': [
454 'chromium/binaries/<(ffmpeg_bin_dir)/avcodec-53.dll', 453 'chromium/binaries/<(ffmpeg_bin_dir)/avcodec-53.dll',
455 'chromium/binaries/<(ffmpeg_bin_dir)/avformat-53.dll', 454 'chromium/binaries/<(ffmpeg_bin_dir)/avformat-53.dll',
456 'chromium/binaries/<(ffmpeg_bin_dir)/avutil-51.dll', 455 'chromium/binaries/<(ffmpeg_bin_dir)/avutil-51.dll',
457 ], 456 ],
458 }], 457 }],
459 }, { # else OS != "win", use POSIX stub generator 458 }, { # else OS != "win", use POSIX stub generator
460 'variables': { 459 'variables': {
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
547 ], 546 ],
548 }], 547 }],
549 ], 548 ],
550 }], 549 }],
551 ], # conditions 550 ], # conditions
552 }], 551 }],
553 ], # conditions 552 ], # conditions
554 }, 553 },
555 ], # targets 554 ], # targets
556 } 555 }
OLDNEW
« configure ('K') | « configure ('k') | libavcodec/allcodecs.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698