diff options
| author | hbos <hbos@webrtc.org> | 2016-01-11 10:19:02 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-11 18:19:06 +0000 |
| commit | a9a1d2acaf71281a6f09cd85acb6bc21b02e5ce4 (patch) | |
| tree | 794e24bc52847bfd557a44a3463b7037c471e415 /setup_links.py | |
| parent | 78234956985d837ebdc16b0fc5d6cea8de9192a2 (diff) | |
| download | webrtc-a9a1d2acaf71281a6f09cd85acb6bc21b02e5ce4.tar.gz | |
H.264: Default flags and pulling in openh264 and ffmpeg.
Defining use_third_party_h264 directly, and indirectly defining use_openh264 (from third_party/openh264) and ffmpeg_branding (from third_party/ffmpeg).
These will be used in a follow-up CL that adds an encoder and decoder implementation.
The flags are added in this CL so that they can be used by trybots/waterfall bots in GN without "Build argument had no effect" errors. Equivalent GYP changes are also added.
BUG=468365
Review URL: https://codereview.webrtc.org/1575913003
Cr-Commit-Position: refs/heads/master@{#11204}
Diffstat (limited to 'setup_links.py')
| -rwxr-xr-x | setup_links.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/setup_links.py b/setup_links.py index 4ef40ead0a..492c38b70e 100755 --- a/setup_links.py +++ b/setup_links.py @@ -40,6 +40,7 @@ DIRECTORIES = [ 'third_party/colorama', 'third_party/drmemory', 'third_party/expat', + 'third_party/ffmpeg', 'third_party/instrumented_libraries', 'third_party/jsoncpp', 'third_party/libc++-static', @@ -53,6 +54,7 @@ DIRECTORIES = [ 'third_party/lss', 'third_party/nss', 'third_party/ocmock', + 'third_party/openh264', 'third_party/openmax_dl', 'third_party/opus', 'third_party/proguard', |