From f43017bfe97c07aa73206d8d1388294cdbee628f Mon Sep 17 00:00:00 2001 From: Marcin Kurczewski Date: Mon, 13 Apr 2015 09:36:54 +0200 Subject: Update license headers Signed-off-by: wm4 --- demux/demux.c | 9 ++++----- demux/demux.h | 9 ++++----- demux/demux_cue.c | 11 +++++------ demux/demux_edl.c | 11 +++++------ demux/demux_lavf.c | 9 ++++----- demux/demux_mf.c | 9 ++++----- demux/demux_mkv.c | 9 ++++----- demux/demux_mkv_timeline.c | 9 ++++----- demux/demux_raw.c | 9 ++++----- demux/demux_subreader.c | 9 ++++----- demux/ebml.c | 9 ++++----- demux/ebml.h | 9 ++++----- demux/matroska.h | 9 ++++----- demux/packet.h | 9 ++++----- demux/stheader.h | 9 ++++----- 15 files changed, 62 insertions(+), 77 deletions(-) (limited to 'demux') diff --git a/demux/demux.c b/demux/demux.c index 6790ba52c3..c5fb6dc517 100644 --- a/demux/demux.c +++ b/demux/demux.c @@ -1,19 +1,18 @@ /* - * This file is part of MPlayer. + * This file is part of mpv. * - * MPlayer is free software; you can redistribute it and/or modify + * mpv 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. * - * MPlayer is distributed in the hope that it will be useful, + * mpv 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 MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * with mpv. If not, see . */ #include diff --git a/demux/demux.h b/demux/demux.h index 702da3fbd5..b730724ed3 100644 --- a/demux/demux.h +++ b/demux/demux.h @@ -1,19 +1,18 @@ /* - * This file is part of MPlayer. + * This file is part of mpv. * - * MPlayer is free software; you can redistribute it and/or modify + * mpv 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. * - * MPlayer is distributed in the hope that it will be useful, + * mpv 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 MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * with mpv. If not, see . */ #ifndef MPLAYER_DEMUXER_H diff --git a/demux/demux_cue.c b/demux/demux_cue.c index 6db9e29717..93518c9336 100644 --- a/demux/demux_cue.c +++ b/demux/demux_cue.c @@ -1,21 +1,20 @@ /* - * This file is part of MPlayer. - * * Original author: Uoti Urpala * - * MPlayer is free software; you can redistribute it and/or modify + * This file is part of mpv. + * + * mpv 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. * - * MPlayer is distributed in the hope that it will be useful, + * mpv 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 MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * with mpv. If not, see . */ #include diff --git a/demux/demux_edl.c b/demux/demux_edl.c index ed014314c9..3bda4f44b2 100644 --- a/demux/demux_edl.c +++ b/demux/demux_edl.c @@ -1,21 +1,20 @@ /* - * This file is part of MPlayer. - * * Original author: Uoti Urpala * - * MPlayer is free software; you can redistribute it and/or modify + * This file is part of mpv. + * + * mpv 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. * - * MPlayer is distributed in the hope that it will be useful, + * mpv 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 MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * with mpv. If not, see . */ #include diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c index 6252fc92e9..dd122f7325 100644 --- a/demux/demux_lavf.c +++ b/demux/demux_lavf.c @@ -1,21 +1,20 @@ /* * Copyright (C) 2004 Michael Niedermayer * - * This file is part of MPlayer. + * This file is part of mpv. * - * MPlayer is free software; you can redistribute it and/or modify + * mpv 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. * - * MPlayer is distributed in the hope that it will be useful, + * mpv 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 MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * with mpv. If not, see . */ #include diff --git a/demux/demux_mf.c b/demux/demux_mf.c index 4fb5f2a1f4..ab703c0ced 100644 --- a/demux/demux_mf.c +++ b/demux/demux_mf.c @@ -1,19 +1,18 @@ /* - * This file is part of MPlayer. + * This file is part of mpv. * - * MPlayer is free software; you can redistribute it and/or modify + * mpv 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. * - * MPlayer is distributed in the hope that it will be useful, + * mpv 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 MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * with mpv. If not, see . */ #include diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c index ead19ac37f..4216a6ad71 100644 --- a/demux/demux_mkv.c +++ b/demux/demux_mkv.c @@ -4,21 +4,20 @@ * Based on the one written by Ronald Bultje for gstreamer * and on demux_mkv.cpp from Moritz Bunkus. * - * This file is part of MPlayer. + * This file is part of mpv. * - * MPlayer is free software; you can redistribute it and/or modify + * mpv 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. * - * MPlayer is distributed in the hope that it will be useful, + * mpv 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 MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * with mpv. If not, see . */ #include diff --git a/demux/demux_mkv_timeline.c b/demux/demux_mkv_timeline.c index 09e411eda7..c7310a66cf 100644 --- a/demux/demux_mkv_timeline.c +++ b/demux/demux_mkv_timeline.c @@ -1,19 +1,18 @@ /* - * This file is part of MPlayer. + * This file is part of mpv. * - * MPlayer is free software; you can redistribute it and/or modify + * mpv 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. * - * MPlayer is distributed in the hope that it will be useful, + * mpv 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 MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * with mpv. If not, see . */ #include diff --git a/demux/demux_raw.c b/demux/demux_raw.c index bd928cc49f..f12b774984 100644 --- a/demux/demux_raw.c +++ b/demux/demux_raw.c @@ -1,19 +1,18 @@ /* - * This file is part of MPlayer. + * This file is part of mpv. * - * MPlayer is free software; you can redistribute it and/or modify + * mpv 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. * - * MPlayer is distributed in the hope that it will be useful, + * mpv 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 MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * with mpv. If not, see . */ #include "config.h" diff --git a/demux/demux_subreader.c b/demux/demux_subreader.c index 4ea5bb9c43..55a85429c6 100644 --- a/demux/demux_subreader.c +++ b/demux/demux_subreader.c @@ -4,21 +4,20 @@ * Copyright (c) 2001 laaz * Some code cleanup & realloc() by A'rpi/ESP-team * - * This file is part of MPlayer. + * This file is part of mpv. * - * MPlayer is free software; you can redistribute it and/or modify + * mpv 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. * - * MPlayer is distributed in the hope that it will be useful, + * mpv 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 MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * with mpv. If not, see . */ #include diff --git a/demux/ebml.c b/demux/ebml.c index 52e0f75888..d75b61e84c 100644 --- a/demux/ebml.c +++ b/demux/ebml.c @@ -4,21 +4,20 @@ * copyright (c) 2004 Aurelien Jacobs * based on the one written by Ronald Bultje for gstreamer * - * This file is part of MPlayer. + * This file is part of mpv. * - * MPlayer is free software; you can redistribute it and/or modify + * mpv 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. * - * MPlayer is distributed in the hope that it will be useful, + * mpv 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 MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * with mpv. If not, see . */ #include "config.h" diff --git a/demux/ebml.h b/demux/ebml.h index 9d7a0cc924..6821c1bbc9 100644 --- a/demux/ebml.h +++ b/demux/ebml.h @@ -1,19 +1,18 @@ /* - * This file is part of MPlayer. + * This file is part of mpv. * - * MPlayer is free software; you can redistribute it and/or modify + * mpv 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. * - * MPlayer is distributed in the hope that it will be useful, + * mpv 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 MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * with mpv. If not, see . */ #ifndef MPLAYER_EBML_H diff --git a/demux/matroska.h b/demux/matroska.h index b4f13d97a8..fce4e6a43c 100644 --- a/demux/matroska.h +++ b/demux/matroska.h @@ -3,21 +3,20 @@ * * see http://www.matroska.org/technical/specs/codecid/index.html * - * This file is part of MPlayer. + * This file is part of mpv. * - * MPlayer is free software; you can redistribute it and/or modify + * mpv 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. * - * MPlayer is distributed in the hope that it will be useful, + * mpv 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 MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * with mpv. If not, see . */ #ifndef MPLAYER_MATROSKA_H diff --git a/demux/packet.h b/demux/packet.h index 213ee025cb..784a1de405 100644 --- a/demux/packet.h +++ b/demux/packet.h @@ -1,19 +1,18 @@ /* - * This file is part of mplayer2. + * This file is part of mpv. * - * mplayer2 is free software; you can redistribute it and/or modify + * mpv 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. * - * mplayer2 is distributed in the hope that it will be useful, + * mpv 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 mplayer2; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * with mpv. If not, see . */ #ifndef MPLAYER_DEMUX_PACKET_H diff --git a/demux/stheader.h b/demux/stheader.h index 1af91e032b..3f44a5c57c 100644 --- a/demux/stheader.h +++ b/demux/stheader.h @@ -1,19 +1,18 @@ /* - * This file is part of MPlayer. + * This file is part of mpv. * - * MPlayer is free software; you can redistribute it and/or modify + * mpv 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. * - * MPlayer is distributed in the hope that it will be useful, + * mpv 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 MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * with mpv. If not, see . */ #ifndef MPLAYER_STHEADER_H -- cgit v1.2.3