diff options
24 files changed, 67 insertions, 361 deletions
diff --git a/gst/mpegpsmux/mpegpsmux_aac.c b/gst/mpegpsmux/mpegpsmux_aac.c index 3f7b0cbcb..b320fbef7 100644 --- a/gst/mpegpsmux/mpegpsmux_aac.c +++ b/gst/mpegpsmux/mpegpsmux_aac.c @@ -6,10 +6,9 @@ * * Copyright 2008 Lin YANG <oxcsnicho@gmail.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: * @@ -40,22 +39,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. @@ -80,6 +63,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 */ #ifdef HAVE_CONFIG_H diff --git a/gst/mpegpsmux/mpegpsmux_aac.h b/gst/mpegpsmux/mpegpsmux_aac.h index 6773d187c..461dc772f 100644 --- a/gst/mpegpsmux/mpegpsmux_aac.h +++ b/gst/mpegpsmux/mpegpsmux_aac.h @@ -6,10 +6,9 @@ * * Copyright 2008 Lin YANG <oxcsnicho@gmail.com> * - * This library is licensed under 4 different licenses and you + * This library is licensed under three 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: * @@ -40,22 +39,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. @@ -80,6 +63,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 __MPEGPSMUX_AAC_H__ diff --git a/gst/mpegpsmux/mpegpsmux_h264.c b/gst/mpegpsmux/mpegpsmux_h264.c index bff1aa0f9..e5a04fef2 100644 --- a/gst/mpegpsmux/mpegpsmux_h264.c +++ b/gst/mpegpsmux/mpegpsmux_h264.c @@ -6,10 +6,9 @@ * * Copyright 2008 Lin YANG <oxcsnicho@gmail.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: * @@ -40,22 +39,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. @@ -80,6 +63,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 */ #ifdef HAVE_CONFIG_H diff --git a/gst/mpegpsmux/mpegpsmux_h264.h b/gst/mpegpsmux/mpegpsmux_h264.h index 8a854662b..2fc6cc9e2 100644 --- a/gst/mpegpsmux/mpegpsmux_h264.h +++ b/gst/mpegpsmux/mpegpsmux_h264.h @@ -6,10 +6,9 @@ * * Copyright 2008 Lin YANG <oxcsnicho@gmail.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: * @@ -40,22 +39,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. @@ -80,6 +63,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 __MPEGPSMUX_H264_H__ diff --git a/gst/mpegtsmux/gstatscmux.c b/gst/mpegtsmux/gstatscmux.c index 9a54fe016..f50f5df2d 100644 --- a/gst/mpegtsmux/gstatscmux.c +++ b/gst/mpegtsmux/gstatscmux.c @@ -17,6 +17,8 @@ * License along with this library; if not, write to the * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, * Boston, MA 02110-1301, USA. + * + * SPDX-License-Identifier: LGPL-2.0-or-later */ #include "gstatscmux.h" diff --git a/gst/mpegtsmux/gstatscmux.h b/gst/mpegtsmux/gstatscmux.h index 41015723f..e471b4ef8 100644 --- a/gst/mpegtsmux/gstatscmux.h +++ b/gst/mpegtsmux/gstatscmux.h @@ -17,6 +17,8 @@ * License along with this library; if not, write to the * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, * Boston, MA 02110-1301, USA. + * + * SPDX-License-Identifier: LGPL-2.0-or-later */ #ifndef __ATSCMUX_H__ diff --git a/gst/mpegtsmux/gstbasetsmux.c b/gst/mpegtsmux/gstbasetsmux.c index 5fc5ee0a2..55d80aa06 100644 --- a/gst/mpegtsmux/gstbasetsmux.c +++ b/gst/mpegtsmux/gstbasetsmux.c @@ -6,10 +6,9 @@ * * Copyright (C) 2011 Jan Schmidt <thaytan@noraisin.net> * - * 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: * @@ -40,22 +39,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. @@ -80,6 +63,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 */ #include <stdio.h> diff --git a/gst/mpegtsmux/gstbasetsmux.h b/gst/mpegtsmux/gstbasetsmux.h index c0d678bca..59114bacc 100644 --- a/gst/mpegtsmux/gstbasetsmux.h +++ b/gst/mpegtsmux/gstbasetsmux.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_H__ diff --git a/gst/mpegtsmux/gstbasetsmuxaac.c b/gst/mpegtsmux/gstbasetsmuxaac.c index 1080165d0..3712591ce 100644 --- a/gst/mpegtsmux/gstbasetsmuxaac.c +++ b/gst/mpegtsmux/gstbasetsmuxaac.c @@ -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 */ #ifdef HAVE_CONFIG_H diff --git a/gst/mpegtsmux/gstbasetsmuxaac.h b/gst/mpegtsmux/gstbasetsmuxaac.h index 6e9f0b034..a8ef923cc 100644 --- a/gst/mpegtsmux/gstbasetsmuxaac.h +++ b/gst/mpegtsmux/gstbasetsmuxaac.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_AAC_H__ diff --git a/gst/mpegtsmux/gstbasetsmuxjpeg2000.c b/gst/mpegtsmux/gstbasetsmuxjpeg2000.c index d901285b6..e7b02cc51 100644 --- a/gst/mpegtsmux/gstbasetsmuxjpeg2000.c +++ b/gst/mpegtsmux/gstbasetsmuxjpeg2000.c @@ -20,6 +20,8 @@ * License along with this library; if not, write to the * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, * Boston, MA 02110-1301, USA. + * + * SPDX-License-Identifier: LGPL-2.0-or-later */ #ifdef HAVE_CONFIG_H diff --git a/gst/mpegtsmux/gstbasetsmuxjpeg2000.h b/gst/mpegtsmux/gstbasetsmuxjpeg2000.h index 75c3939dd..9c1524e2d 100644 --- a/gst/mpegtsmux/gstbasetsmuxjpeg2000.h +++ b/gst/mpegtsmux/gstbasetsmuxjpeg2000.h @@ -20,6 +20,8 @@ * License along with this library; if not, write to the * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, * Boston, MA 02110-1301, USA. + * + * SPDX-License-Identifier: LGPL-2.0-or-later */ #ifndef __BASETSMUX_JPEG2000_H__ diff --git a/gst/mpegtsmux/gstbasetsmuxopus.c b/gst/mpegtsmux/gstbasetsmuxopus.c index 75945bd6d..b764073c3 100644 --- a/gst/mpegtsmux/gstbasetsmuxopus.c +++ b/gst/mpegtsmux/gstbasetsmuxopus.c @@ -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 */ #ifdef HAVE_CONFIG_H 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__ diff --git a/gst/mpegtsmux/gstbasetsmuxttxt.c b/gst/mpegtsmux/gstbasetsmuxttxt.c index 03b6801a4..726612ec7 100644 --- a/gst/mpegtsmux/gstbasetsmuxttxt.c +++ b/gst/mpegtsmux/gstbasetsmuxttxt.c @@ -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 */ #ifdef HAVE_CONFIG_H diff --git a/gst/mpegtsmux/gstbasetsmuxttxt.h b/gst/mpegtsmux/gstbasetsmuxttxt.h index 3b9f351c6..231d53160 100644 --- a/gst/mpegtsmux/gstbasetsmuxttxt.h +++ b/gst/mpegtsmux/gstbasetsmuxttxt.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_TTXT_H__ diff --git a/gst/mpegtsmux/gstmpegtsmux.c b/gst/mpegtsmux/gstmpegtsmux.c index a5fce84ad..d5515a087 100644 --- a/gst/mpegtsmux/gstmpegtsmux.c +++ b/gst/mpegtsmux/gstmpegtsmux.c @@ -6,10 +6,9 @@ * * Copyright (C) 2011 Jan Schmidt <thaytan@noraisin.net> * - * 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: * @@ -40,22 +39,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. @@ -80,6 +63,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 */ /** diff --git a/gst/mpegtsmux/gstmpegtsmux.h b/gst/mpegtsmux/gstmpegtsmux.h index fb97405ec..3cf96ddde 100644 --- a/gst/mpegtsmux/gstmpegtsmux.h +++ b/gst/mpegtsmux/gstmpegtsmux.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 __MPEGTSMUX_H__ diff --git a/gst/mpegtsmux/gstmpegtsmuxplugin.c b/gst/mpegtsmux/gstmpegtsmuxplugin.c index 22552a8b5..1b13e746e 100644 --- a/gst/mpegtsmux/gstmpegtsmuxplugin.c +++ b/gst/mpegtsmux/gstmpegtsmuxplugin.c @@ -1,3 +1,5 @@ +/* SPDX-License-Identifier: LGPL-2.0-or-later */ + #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/gst/mpegtsmux/tsmux/tsmux.c b/gst/mpegtsmux/tsmux/tsmux.c index d0e0eb1ee..e72d799ed 100644 --- a/gst/mpegtsmux/tsmux/tsmux.c +++ b/gst/mpegtsmux/tsmux/tsmux.c @@ -1,10 +1,9 @@ /* * Copyright 2006 BBC and Fluendo S.A. * - * 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: * @@ -35,22 +34,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. @@ -75,6 +58,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 */ #ifdef HAVE_CONFIG_H diff --git a/gst/mpegtsmux/tsmux/tsmux.h b/gst/mpegtsmux/tsmux/tsmux.h index ddb5a662b..5a790a56a 100644 --- a/gst/mpegtsmux/tsmux/tsmux.h +++ b/gst/mpegtsmux/tsmux/tsmux.h @@ -1,10 +1,9 @@ /* * Copyright 2006 BBC and Fluendo S.A. * - * 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: * @@ -35,22 +34,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. @@ -75,6 +58,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 __TSMUX_H__ diff --git a/gst/mpegtsmux/tsmux/tsmuxcommon.h b/gst/mpegtsmux/tsmux/tsmuxcommon.h index eea421640..29b12b939 100644 --- a/gst/mpegtsmux/tsmux/tsmuxcommon.h +++ b/gst/mpegtsmux/tsmux/tsmuxcommon.h @@ -1,10 +1,9 @@ /* * Copyright 2006 BBC and Fluendo S.A. * - * 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: * @@ -35,22 +34,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. @@ -75,6 +58,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 __TSMUX_COMMON_H__ diff --git a/gst/mpegtsmux/tsmux/tsmuxstream.c b/gst/mpegtsmux/tsmux/tsmuxstream.c index d62dd34c6..87ec8b7ed 100644 --- a/gst/mpegtsmux/tsmux/tsmuxstream.c +++ b/gst/mpegtsmux/tsmux/tsmuxstream.c @@ -1,10 +1,9 @@ /* * Copyright 2006 BBC and Fluendo S.A. * - * 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: * @@ -35,22 +34,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. @@ -75,6 +58,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 */ #ifdef HAVE_CONFIG_H diff --git a/gst/mpegtsmux/tsmux/tsmuxstream.h b/gst/mpegtsmux/tsmux/tsmuxstream.h index 93f04671b..7a9bd94f7 100644 --- a/gst/mpegtsmux/tsmux/tsmuxstream.h +++ b/gst/mpegtsmux/tsmux/tsmuxstream.h @@ -1,10 +1,9 @@ /* * Copyright 2006 BBC and Fluendo S.A. * - * 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: * @@ -35,22 +34,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. @@ -75,6 +58,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 __TSMUXSTREAM_H__ |