[Android] Update license
Geoffrey Métais
git at videolan.org
Wed Feb 25 19:11:07 CET 2015
vlc-ports/android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Wed Feb 25 19:10:43 2015 +0100| [5d0b1d1c34b7f237818118589aeb4a2f3d6389c5] | committer: Geoffrey Métais
Update license
> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=5d0b1d1c34b7f237818118589aeb4a2f3d6389c5
---
vlc-android/assets/licence.htm | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/vlc-android/assets/licence.htm b/vlc-android/assets/licence.htm
index 5a1892d..82add62 100644
--- a/vlc-android/assets/licence.htm
+++ b/vlc-android/assets/licence.htm
@@ -18,7 +18,6 @@
<h2>Libraries</h2>
<p>Some VLC plugins use external libraries that make extensive use of the following persons' or companies' code:
<ul>
- <li>ActionBarSherlock - Copyright © 2011-2012 Jake Wharton - <a href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache 2.0</a></li>
<li>Android Open Source Project - Copyright © 2008 The Android Open Source Project - <a href="http://opensource.org/licenses/ISC">2-clause BSD license</a></li>
<li>FFmpeg/Libav - Copyright © 2000-2010 the FFmpeg developers - <a href="http://www.gnu.org/licenses/lgpl-2.1.txt">LGPL v2.1 or later</a></li>
<li>FLAC - Copyright © 2001-2012 Josh Coalson et al. - <a href="http://www.gnu.org/licenses/gpl-2.0.txt">GPL v2 or later</a>, codec libs <a href="#xiph">Xiph.org BSD license</a></li>
@@ -47,6 +46,7 @@
<li>live555 - Copyright © 1996-2012 Live Networks, Inc - <a href="http://www.gnu.org/licenses/lgpl-2.1.txt">LGPL v2.1 or later</a></li>
<li>Lua - Copyright © 1994-2008 Lua.org - <a href="http://www.opensource.org/licenses/mit-license.php">MIT license</a></li>
<li>Openjpeg - Copyright © 2002-2012, Communications and Remote Sensing Laboratory, UCL, Belgium - <a href="http://opensource.org/licenses/ISC">ISC license</a></li>
+ <li>Opus - Copyright © 2001-2015 Xiph.org Foundation, Microsoft - <a href="#xiph">Xiph.org BSD license</a></li>
<li>ORC - Copyright © 2002-2009 David A. Schleef - <a href="http://opensource.org/licenses/ISC">ISC license</a></li>
<li>Schroedinger - Copyright © David Schleef, W.J. van der Laan - <a href="http://www.opensource.org/licenses/mit-license.php">MIT license</a></li>
<li>Speex, Speexdsp - Copyright © 1992-2008 Xiph.org Foundation, Jean-Marc Valin, Analog Devices Inc, Commonwealth Scientific and Industrial Research Organisation, David Rowe, Jutta Degener, Carsten Bormann - <a href="http://www.opensource.org/licenses/BSD-3-Clause">3-clause BSD license</a></li>
@@ -54,10 +54,6 @@
<li>Zlib - Copyright © 1995-2012 Jean-loup Gailly and Mark Adler - <a href="http://zlib.net/zlib_license.html">zlib license</a></li>
</ul>
</p>
- <h2>Graphics</h2>
- <ul>
- <li>Background pattern - Copyright © 2012 Jordan Pittman - <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons BY-SA 3.0</a></li>
- </ul>
</div>
<p><a href="#top">Back to the top</a></p>
<hr />
More information about the Android
mailing list