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
505 Commits 11 Branches 40 Tags 611 MiB
Commit Graph

2 Commits

Author SHA1 Message Date
Anders Hasselqvist cb8de4c2f4 MacOSX: Solve conflicting libwebm targets 
When generating ninja files we end up with two libwebm targets.
packager/media/formats/webm/webm.gyp:webm -> becomes target libwebm
packager/third_party/libwebm/libwebm.gyp:libwebm -> becomes target libwebm

Solve this conflict by renaming libwebm.gyp:libwebm to mkvmuxer.
 2016-01-22 18:50:05 -08:00
Jacob Trimble 074bce8425 Added libwebm and webm-tools to imports 
b/25089850

Change-Id: If97fc4dec70c3c94054b0f7ec5f243d9d5bd676e
 2015-10-22 11:16:29 -07:00