From 10392acca5073f92fa4d36a3901127fccb7a29f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Wed, 30 Dec 2015 11:03:04 +0000 Subject: [PATCH] codecparsers: vp9: move license blurb into header and remove aux files This is just a bunch of lookup tables.. --- gst-libs/gst/codecparsers/Makefile.am | 3 +- gst-libs/gst/codecparsers/vp9utils.AUTHORS | 100 --------------------- gst-libs/gst/codecparsers/vp9utils.LICENSE | 30 ------- gst-libs/gst/codecparsers/vp9utils.PATENTS | 22 ----- gst-libs/gst/codecparsers/vp9utils.c | 34 +++++-- gst-libs/gst/codecparsers/vp9utils.h | 34 +++++-- 6 files changed, 59 insertions(+), 164 deletions(-) delete mode 100644 gst-libs/gst/codecparsers/vp9utils.AUTHORS delete mode 100644 gst-libs/gst/codecparsers/vp9utils.LICENSE delete mode 100644 gst-libs/gst/codecparsers/vp9utils.PATENTS diff --git a/gst-libs/gst/codecparsers/Makefile.am b/gst-libs/gst/codecparsers/Makefile.am index 98140f11aa..b180570198 100644 --- a/gst-libs/gst/codecparsers/Makefile.am +++ b/gst-libs/gst/codecparsers/Makefile.am @@ -38,5 +38,4 @@ libgstcodecparsers_@GST_API_VERSION@_la_LDFLAGS = \ $(GST_ALL_LDFLAGS) \ $(GST_LT_LDFLAGS) -EXTRA_DIST = dboolhuff.LICENSE dboolhuff.PATENTS dboolhuff.AUTHORS \ - vp9utils.LICENSE vp9utils.PATENTS vp9utils.AUTHORS +EXTRA_DIST = dboolhuff.LICENSE dboolhuff.PATENTS dboolhuff.AUTHORS diff --git a/gst-libs/gst/codecparsers/vp9utils.AUTHORS b/gst-libs/gst/codecparsers/vp9utils.AUTHORS deleted file mode 100644 index a9aa481063..0000000000 --- a/gst-libs/gst/codecparsers/vp9utils.AUTHORS +++ /dev/null @@ -1,100 +0,0 @@ -# This file is automatically generated from the git commit history -# by tools/gen_authors.sh. - -Aaron Watry -Abo Talib Mahfoodh -Adrian Grange -Ahmad Sharif -Alexander Voronov -Alex Converse -Alexis Ballier -Alok Ahuja -Alpha Lam -A.Mahfoodh -Ami Fischman -Andoni Morales Alastruey -Andres Mejia -Aron Rosenberg -Attila Nagy -changjun.yang -chm -Christian Duvivier -Daniel Kang -Deb Mukherjee -Dmitry Kovalev -Dragan Mrdjan -Erik Niemeyer -Fabio Pedretti -Frank Galligan -Fredrik Söderquist -Fritz Koenig -Gaute Strokkenes -Giuseppe Scrivano -Guillaume Martres -Guillermo Ballester Valor -Hangyu Kuang -Henrik Lundin -Hui Su -Ivan Maltz -James Berry -James Zern -Jan Kratochvil -Janne Salonen -Jeff Faust -Jeff Muizelaar -Jeff Petkau -Jim Bankoski -Jingning Han -Johann Koenig -John Koleszar -Joshua Bleecher Snyder -Joshua Litt -Justin Clift -Justin Lebar -KO Myung-Hun -Lou Quillio -Luca Barbato -Makoto Kato -Mans Rullgard -Marco Paniconi -Mark Mentovai -Martin Ettl -Martin Storsjo -Matthew Heaney -Michael Kohler -Mike Frysinger -Mike Hommey -Mikhal Shemer -Morton Jonuschat -Parag Salasakar -Pascal Massimino -Patrik Westin -Paul Wilkins -Pavol Rusnak -Paweł Hajdan -Philip Jägenstedt -Priit Laes -Rafael Ávila de Espíndola -Rafaël Carré -Ralph Giles -Rob Bradford -Ronald S. Bultje -Sami Pietilä -Scott Graham -Scott LaVarnway -Shimon Doodkin -Stefan Holmer -Suman Sunkara -Taekhyun Kim -Takanori MATSUURA -Tamar Levy -Tero Rintaluoma -Thijs Vermeir -Timothy B. Terriberry -Tom Finegan -Vignesh Venkatasubramanian -Yaowu Xu -Yunqing Wang -Google Inc. -The Mozilla Foundation -The Xiph.Org Foundation diff --git a/gst-libs/gst/codecparsers/vp9utils.LICENSE b/gst-libs/gst/codecparsers/vp9utils.LICENSE deleted file mode 100644 index 83ef339ecd..0000000000 --- a/gst-libs/gst/codecparsers/vp9utils.LICENSE +++ /dev/null @@ -1,30 +0,0 @@ -Copyright (c) 2010, The WebM 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: - - * 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 the name of Google, nor the WebM Project, nor the names - of its contributors may 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 -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. diff --git a/gst-libs/gst/codecparsers/vp9utils.PATENTS b/gst-libs/gst/codecparsers/vp9utils.PATENTS deleted file mode 100644 index 4414d83850..0000000000 --- a/gst-libs/gst/codecparsers/vp9utils.PATENTS +++ /dev/null @@ -1,22 +0,0 @@ -Additional IP Rights Grant (Patents) - -"This implementation" means the copyrightable works distributed by -Google as part of the WebM Project. - -Google hereby grants to you a perpetual, worldwide, non-exclusive, -no-charge, royalty-free, irrevocable (except as stated in this section) -patent license to make, have made, use, offer to sell, sell, import, -transfer, and otherwise run, modify and propagate the contents of this -implementation of VP8, where such license applies only to those patent -claims, both currently owned by Google and acquired in the future, -licensable by Google that are necessarily infringed by this -implementation of VP8. This grant does not include claims that would be -infringed only as a consequence of further modification of this -implementation. If you or your agent or exclusive licensee institute or -order or agree to the institution of patent litigation against any -entity (including a cross-claim or counterclaim in a lawsuit) alleging -that this implementation of VP8 or any code incorporated within this -implementation of VP8 constitutes direct or contributory patent -infringement, or inducement of patent infringement, then any patent -rights granted to you under this License for this implementation of VP8 -shall terminate as of the date such litigation is filed. diff --git a/gst-libs/gst/codecparsers/vp9utils.c b/gst-libs/gst/codecparsers/vp9utils.c index 997510399c..009fa2416b 100644 --- a/gst-libs/gst/codecparsers/vp9utils.c +++ b/gst-libs/gst/codecparsers/vp9utils.c @@ -1,12 +1,36 @@ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. + * Redistribution and use in source and binary forms, with or without + * modification, 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 the name of Google, nor the WebM Project, nor the names + * of its contributors may 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 + * 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. * */ + #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/gst-libs/gst/codecparsers/vp9utils.h b/gst-libs/gst/codecparsers/vp9utils.h index 0423d30d8e..7f8240bf3d 100644 --- a/gst-libs/gst/codecparsers/vp9utils.h +++ b/gst-libs/gst/codecparsers/vp9utils.h @@ -1,12 +1,36 @@ /* * Copyright (c) 2010 The WebM project authors. All Rights Reserved. * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. + * Redistribution and use in source and binary forms, with or without + * modification, 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 the name of Google, nor the WebM Project, nor the names + * of its contributors may 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 + * 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. * */ + #ifndef __VP9_QUANT_H__ #define __VP9_QUANT_H__