diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2021-09-19 01:18:00 +0100 |
|---|---|---|
| committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2021-09-22 00:20:02 +0000 |
| commit | 11a151ef8049fbc09a19ce14d0b81b9a154d2c75 (patch) | |
| tree | f901b43b9800f195ef6478380136beff4af5b9fe /gst/mpegtsmux/gstbasetsmuxopus.h | |
| parent | 589ff8ca6dcb16057082fbbc0878413728fd1a9e (diff) | |
| download | gstreamer-plugins-bad-11a151ef8049fbc09a19ce14d0b81b9a154d2c75.tar.gz | |
mpegtsmux, mpegpsmux: remove GPL from choice of licenses and add SPDX license identifiers
Some people need to avoid inclusion of GPL code for their use cases and thus
get easily spooked by GPL license headers. This code is actually licensed
under different licenses, only one of which is GPL, and it's already possible
to just upgrade from LGPL to GPL anyway so having the GPL listed explicitly
as one of the choices doesn't really add anything. So remove GPL from the list
and also add SPDX license identifiers while we're at it.
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2539>
Diffstat (limited to 'gst/mpegtsmux/gstbasetsmuxopus.h')
| -rw-r--r-- | gst/mpegtsmux/gstbasetsmuxopus.h | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/gst/mpegtsmux/gstbasetsmuxopus.h b/gst/mpegtsmux/gstbasetsmuxopus.h index f8d9dcfd2..84f35e7e1 100644 --- a/gst/mpegtsmux/gstbasetsmuxopus.h +++ b/gst/mpegtsmux/gstbasetsmuxopus.h @@ -4,10 +4,9 @@ * Kapil Agrawal <kapil@fluendo.com> * Julien Moutte <julien@fluendo.com> * - * This library is licensed under 4 different licenses and you + * This library is licensed under 3 different licenses and you * can choose to use it under the terms of any one of them. The - * four licenses are the MPL 1.1, the LGPL, the GPL and the MIT - * license. + * three licenses are the MPL 1.1, the LGPL and the MIT license. * * MPL: * @@ -38,22 +37,6 @@ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, * Boston, MA 02110-1301, USA. * - * GPL: - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. - * * MIT: * * Unless otherwise indicated, Source Code is licensed under MIT license. @@ -78,6 +61,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. * + * SPDX-License-Identifier: MPL-1.1 OR MIT OR LGPL-2.0-or-later */ #ifndef __BASETSMUX_OPUS_H__ |