1 --- chromium-30.0.1599.114/third_party/ffmpeg/ffmpeg.gyp.orig 2013-10-22 11:54:40.000000000 +0200
2 +++ chromium-30.0.1599.114/third_party/ffmpeg/ffmpeg.gyp 2013-10-22 11:54:51.000000000 +0200
4 'extra_header': 'chromium/ffmpeg_stub_headers.fragment',
7 + ['target_arch != "arm"', {
10 + 'target_name': 'ffmpeg_yasm',
11 + 'type': 'static_library',
12 + # VS2010 does not correctly incrementally link obj files generated
13 + # from asm files. This flag disables UseLibraryDependencyInputs to
14 + # avoid this problem.
15 + 'msvs_2010_disable_uldi_when_referenced': 1,
17 + 'ffmpeg_generated.gypi',
18 + '../yasm/yasm_compile.gypi',
22 + # XCode doesn't want to link a pure assembly target and will fail
23 + # to link when it creates an empty file list. So add a dummy file
24 + # keep the linker happy. See http://crbug.com/157073
28 + # Path to platform configuration files.
29 + 'platform_config_root': 'chromium/config/<(ffmpeg_branding)/<(os_config)/<(ffmpeg_config)',
31 + ['target_arch == "ia32"', {
32 + 'more_yasm_flags': [
36 + 'more_yasm_flags': [
41 + 'more_yasm_flags': [
42 + # Necessary to ensure symbols end up with a _ prefix; added by
43 + # yasm_compile.gypi for Windows, but not Mac.
50 + '>@(more_yasm_flags)',
51 + '-I', '<(platform_config_root)',
52 + '-I', 'libavcodec/x86/',
53 + '-I', 'libavutil/x86/',
55 + # Disable warnings, prevents log spam for things we won't fix.
59 + 'yasm_output_path': '<(shared_generated_dir)/yasm'
64 ['OS == "win" and clang == 0', {
65 # Convert the source code from c99 to c89 if we're on Windows and not
66 # using clang, which can compile c99 directly. Clang support is
72 - 'target_name': 'ffmpeg_yasm',
73 - 'type': 'static_library',
74 - # VS2010 does not correctly incrementally link obj files generated
75 - # from asm files. This flag disables UseLibraryDependencyInputs to
76 - # avoid this problem.
77 - 'msvs_2010_disable_uldi_when_referenced': 1,
79 - 'ffmpeg_generated.gypi',
80 - '../yasm/yasm_compile.gypi',
84 - # XCode doesn't want to link a pure assembly target and will fail
85 - # to link when it creates an empty file list. So add a dummy file
86 - # keep the linker happy. See http://crbug.com/157073
90 - # Path to platform configuration files.
91 - 'platform_config_root': 'chromium/config/<(ffmpeg_branding)/<(os_config)/<(ffmpeg_config)',
93 - ['target_arch == "ia32"', {
94 - 'more_yasm_flags': [
98 - 'more_yasm_flags': [
103 - 'more_yasm_flags': [
104 - # Necessary to ensure symbols end up with a _ prefix; added by
105 - # yasm_compile.gypi for Windows, but not Mac.
112 - '>@(more_yasm_flags)',
113 - '-I', '<(platform_config_root)',
114 - '-I', 'libavcodec/x86/',
115 - '-I', 'libavutil/x86/',
117 - # Disable warnings, prevents log spam for things we won't fix.
119 - '-P', 'config.asm',
121 - 'yasm_output_path': '<(shared_generated_dir)/yasm'