Bug 959773: Add x264 license for libyuv update r=gerv
authorRandell Jesup <rjesup@jesup.org>
Thu, 30 Jan 2014 19:54:35 -0500
changeset 166861 ccee696962b99445e37c32c94aff0267ab47caa6
parent 166860 ad4829ac770a3964e71935678a067f1c98b671e6
child 166862 f9315e1a38447e5f62ed9ff64470397252fcbc1f
push id4853
push usercbook@mozilla.com
push dateWed, 05 Feb 2014 13:54:35 +0000
treeherderfx-team@0965914f979c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgerv
bugs959773
milestone30.0a1
Bug 959773: Add x264 license for libyuv update r=gerv
toolkit/content/license.html
--- a/toolkit/content/license.html
+++ b/toolkit/content/license.html
@@ -124,16 +124,17 @@
       <li><a href="about:license#sunsoft">SunSoft License</a></li>
       <li><a href="about:license#unicode">Unicode License</a></li>
       <li><a href="about:license#ucal">University of California License</a></li>
       <li><a href="about:license#uszeged">University of Szeged License</a></li>
       <li><a href="about:license#hunspell-en-US">US English Spellchecking Dictionary Licenses</a></li>
       <li><a href="about:license#v8">V8 License</a></li>
       <li><a href="about:license#vtune">VTune License</a></li>
       <li><a href="about:license#webrtc">WebRTC License</a></li>
+      <li><a href="about:license#x264">x264 License</a></li>
       <li><a href="about:license#xiph">Xiph.org Foundation License</a></li>
     </ul>
 
 <br>
 
     <ul>
       <li><a href="about:license#other-notices">Other Required Notices</a>
       <li><a href="about:license#optional-notices">Optional Notices</a>
@@ -2990,17 +2991,18 @@ ARISING IN ANY WAY OUT OF THE USE OF THI
 OF THE POSSIBILITY OF SUCH DAMAGE.
 </pre>
 
     <hr>
 
     <h1><a id="libyuv"></a>libyuv License</h1>
 
     <p>This license applies to files in the directory
-    <span class="path">media/webrtc/trunk/third_party/libyuv</span>.
+    <span class="path">media/webrtc/trunk/third_party/libyuv</span> except
+    for the file <span class="path">media/webrtc/trunk/third_party/libyuv/source/x86inc.asm</span>.
     </p>
 
 <pre>
 Copyright (c) 2011, The LibYuv project authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
@@ -4269,16 +4271,45 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTI
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 </pre>
 
 
     <hr>
 
+    <h1><a id="x264"></a>x264 License</h1>
+
+    <p>This license applies to the file <span class="path">
+    media/webrtc/trunk/third_party/libyuv/source/x86inc.asm</span>.
+    </p>
+
+<pre>
+Copyright (C) 2005-2012 x264 project
+
+Authors: Loren Merritt <lorenm@u.washington.edu>
+         Anton Mitrofanov <BugMaster@narod.ru>
+         Jason Garrett-Glaser <darkshikari@gmail.com>
+         Henrik Gramner <hengar-6@student.ltu.se>
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+</pre>
+
+    <hr>
+
     <h1><a id="xiph"></a>Xiph.org Foundation License</h1>
 
     <p>This license applies to files in the following directories
       with the specified copyright year ranges:</p>
     <ul>
       <li><span class="path">media/libogg/</span>, 2002</li>
       <li><span class="path">media/libtheora/</span>, 2002-2007</li>
       <li><span class="path">media/libvorbis/</span>, 2002-2004</li>