Index: third_party/openh264/LICENSE |
diff --git a/base/third_party/superfasthash/LICENSE b/third_party/openh264/LICENSE |
similarity index 73% |
copy from base/third_party/superfasthash/LICENSE |
copy to third_party/openh264/LICENSE |
index 3c40a3ecd791a2137e466ffd216e9813d0e98e90..8e730c4e2c646c2057326c54c932bdbddf11deea 100644 |
--- a/base/third_party/superfasthash/LICENSE |
+++ b/third_party/openh264/LICENSE |
@@ -1,6 +1,4 @@ |
-Paul Hsieh OLD BSD license |
- |
-Copyright (c) 2010, Paul Hsieh |
+Copyright (c) 2013, Cisco Systems |
All rights reserved. |
Redistribution and use in source and binary forms, with or without modification, |
@@ -8,20 +6,18 @@ are permitted provided that the following conditions are met: |
* Redistributions of source code must retain the above copyright notice, this |
list of conditions and the following disclaimer. |
+ |
* Redistributions in binary form must reproduce the above copyright notice, this |
list of conditions and the following disclaimer in the documentation and/or |
other materials provided with the distribution. |
-* Neither my name, Paul Hsieh, nor the names of any other contributors to the |
- code use may not be used to endorse or promote products derived from this |
- software without specific prior written permission. |
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND |
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR |
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR |
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON |
ANY 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. |
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |