Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Adding license information.
Code is released under the Apache License, Version 2.0 unless specified
otherwise. All third party code is obviously still under the original license
of that code.

Fixes #108.
  • Loading branch information
mithro committed May 4, 2015
1 parent 0d9caab commit 9b66b53
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 0 deletions.
11 changes: 11 additions & 0 deletions LICENSE
@@ -0,0 +1,11 @@
Unless otherwise specified, the code in this repository is licensed under the
Apache License, Version 2.0. You may not use this code except in compliance
with the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
15 changes: 15 additions & 0 deletions README.md
Expand Up @@ -64,6 +64,21 @@ groups like Sydney Linux User Group and Sydney Python User Group.

* **youtube** - Upload recorded videos to YouTube channel.

## License

Unless specified otherwise, code is licensed under the
[Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0).

This project makes extensive use of third party code from external projects.
For this code either LICENSE of COPYING file in the top level directory or the
file header for more information.

The website part of this system does use one non-free software component.
jwplayer (found in website/frontend/static/third_party/jwplayer/) is under a
CC-BY-NC 3.0 license. Work is underway to replace this dependency with a fully
open solution, see
[Issue #60](https://github.com/timvideos/streaming-system/issues/60).

## Related Projects

### gst-switch
Expand Down

0 comments on commit 9b66b53

Please sign in to comment.