Mirror-Tools
/
shaka-packager
mirror of https://github.com/shaka-project/shaka-packager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added libwebm and webm-tools to imports 

b/25089850

Change-Id: If97fc4dec70c3c94054b0f7ec5f243d9d5bd676e
This commit is contained in:
Jacob Trimble 2015-10-21 14:35:03 -07:00
parent 05f80f961c
commit 074bce8425
4 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -17,9 +17,11 @@
/packager/third_party/gflags/ /packager/third_party/gflags/
/packager/third_party/gold/ /packager/third_party/gold/
/packager/third_party/icu/ /packager/third_party/icu/
/packager/third_party/libwebm/src/
/packager/third_party/llvm-build/ /packager/third_party/llvm-build/
/packager/third_party/modp_b64/ /packager/third_party/modp_b64/
/packager/third_party/openssl/ /packager/third_party/openssl/
/packager/third_party/webm-tools/src/
/packager/third_party/yasm/source/patched-yasm/ /packager/third_party/yasm/source/patched-yasm/
/packager/third_party/zlib/ /packager/third_party/zlib/
/packager/tools/clang/ /packager/tools/clang/

6
DEPS
View File

@ -48,9 +48,15 @@ deps = {
"src/packager/third_party/icu": "src/packager/third_party/icu":
Var("chromium_git") + "/chromium/third_party/icu46@78597121d71a5922f5726e715c6ad06c50ae6cdc", Var("chromium_git") + "/chromium/third_party/icu46@78597121d71a5922f5726e715c6ad06c50ae6cdc",
"src/packager/third_party/libwebm/src":
Var("chromium_git") + "/webm/libwebm@1ad314e297a43966605c4ef23a6442bb58e1d9be",
"src/packager/third_party/modp_b64": "src/packager/third_party/modp_b64":
Var("chromium_git") + "/chromium/src/third_party/modp_b64@3a0e3b4ef6c54678a2d14522533df56b33b56119", Var("chromium_git") + "/chromium/src/third_party/modp_b64@3a0e3b4ef6c54678a2d14522533df56b33b56119",
"src/packager/third_party/webm-tools/src":
Var("chromium_git") + "/webm/webm-tools@702ff3e4bb462b24464a202f8fcf9f65cc44b6e5",
"src/packager/tools/clang": "src/packager/tools/clang":
Var("chromium_git") + "/chromium/src/tools/clang@0de8f3bb6af64e13876273c601704795d5e00faf", Var("chromium_git") + "/chromium/src/tools/clang@0de8f3bb6af64e13876273c601704795d5e00faf",

1
packager/media/formats/webm/webm.gyp
View File

@ -39,6 +39,7 @@
'webm_webvtt_parser.h' 'webm_webvtt_parser.h'
], ],
'dependencies': [ 'dependencies': [
'../../../third_party/libwebm/libwebm.gyp:libwebm',
'../../base/media_base.gyp:base', '../../base/media_base.gyp:base',
], ],
}, },

24
packager/third_party/libwebm/libwebm.gyp vendored Normal file
View File

@ -0,0 +1,24 @@
# Copyright 2015 Google Inc. All rights reserved.
#
# Use of this source code is governed by a BSD-style
# license that can be found in the LICENSE file or at
# https://developers.google.com/open-source/licenses/bsd
{
'includes': [
],
'targets': [
{
'target_name': 'libwebm',
'type': 'static_library',
'sources': [
'src/mkvmuxer.cpp',
'src/mkvmuxer.hpp',
'src/mkvmuxerutil.cpp',
'src/mkvmuxerutil.hpp',
'src/mkvwriter.cpp',
'src/mkvwriter.hpp',
],
},
],
}