Chromium Code Reviews| Index: scripts/slave/recipe_modules/chromium/config.py |
| diff --git a/scripts/slave/recipe_modules/chromium/config.py b/scripts/slave/recipe_modules/chromium/config.py |
| index d467955af49d20f4a69d565d8d0e04789076dd33..1fb22f6258942b31b70770e7ee0fa45ebd98eb19 100644 |
| --- a/scripts/slave/recipe_modules/chromium/config.py |
| +++ b/scripts/slave/recipe_modules/chromium/config.py |
| @@ -366,6 +366,12 @@ def proprietary_codecs(c, invert=False): |
| c.gyp_env.GYP_DEFINES['proprietary_codecs'] = int(not invert) |
| @config_ctx() |
| +def openh264(c): |
|
hbos_chromium
2016/01/11 14:21:09
Hmm the name "openh264" might be misleading here s
kjellander_chromium
2016/01/12 10:11:45
Well, OpenH264 is not used at all in Chromium, as
|
| + ffmpeg_branding(c, branding='Chrome') |
|
hbos_chromium
2016/01/11 14:21:09
(Any idea what happens if multiple defs are used a
kjellander_chromium
2016/01/12 10:11:45
Any latter will overwrite the previous, but it's u
|
| + c.gyp_env.GYP_DEFINES['use_openh264'] = 1 |
| + c.gyp_env.GYP_DEFINES['use_third_party_h264'] = 1 |
| + |
| +@config_ctx() |
| def chrome_with_codecs(c): |
| ffmpeg_branding(c, branding='Chrome') |
| proprietary_codecs(c) |