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 --- osdep/io.c | 10 ++++++---- osdep/io.h | 8 ++++---- osdep/macosx_application.h | 3 +-- osdep/macosx_application.m | 3 +-- osdep/macosx_application_objc.h | 3 +-- osdep/macosx_events.h | 4 ++-- osdep/mpv.rc | 11 +++++------ osdep/path-macosx.m | 3 +-- osdep/terminal-win.c | 9 ++++----- osdep/terminal.h | 9 ++++----- osdep/timer-linux.c | 9 ++++----- osdep/timer-win2.c | 9 ++++----- osdep/timer.h | 9 ++++----- 13 files changed, 41 insertions(+), 49 deletions(-) (limited to 'osdep') diff --git a/osdep/io.c b/osdep/io.c index 00cba27017..fdb625d080 100644 --- a/osdep/io.c +++ b/osdep/io.c @@ -1,22 +1,24 @@ /* * unicode/utf-8 I/O helpers and wrappers for Windows * - * This file is part of mplayer2. * Contains parts based on libav code (http://libav.org). * - * mplayer2 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. * - * 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, see . + * with mpv. If not, see . */ + #include #include #include diff --git a/osdep/io.h b/osdep/io.h index a116f3e566..8d3e24f551 100644 --- a/osdep/io.h +++ b/osdep/io.h @@ -1,20 +1,20 @@ /* * unicode/utf-8 I/O helpers and wrappers for Windows * - * 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, see . + * with mpv. If not, see . */ #ifndef MPLAYER_OSDEP_IO diff --git a/osdep/macosx_application.h b/osdep/macosx_application.h index d6a9425f29..8202093aed 100644 --- a/osdep/macosx_application.h +++ b/osdep/macosx_application.h @@ -12,8 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along - * with mpv; 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 MPV_MACOSX_APPLICATION diff --git a/osdep/macosx_application.m b/osdep/macosx_application.m index ac1f4863da..3691e922a5 100644 --- a/osdep/macosx_application.m +++ b/osdep/macosx_application.m @@ -12,8 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along - * with mpv; 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/osdep/macosx_application_objc.h b/osdep/macosx_application_objc.h index 6b0ca15c2e..0f18952c7e 100644 --- a/osdep/macosx_application_objc.h +++ b/osdep/macosx_application_objc.h @@ -12,8 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along - * with mpv; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * with mpv. If not, see . */ #import diff --git a/osdep/macosx_events.h b/osdep/macosx_events.h index f9008b40ec..a6bfbfef95 100644 --- a/osdep/macosx_events.h +++ b/osdep/macosx_events.h @@ -3,12 +3,12 @@ * * 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. diff --git a/osdep/mpv.rc b/osdep/mpv.rc index 4a9d611bd7..f2d9042a36 100644 --- a/osdep/mpv.rc +++ b/osdep/mpv.rc @@ -1,21 +1,20 @@ /* - * Windows resource file for MPlayer + * Windows resource file for mpv * - * 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/osdep/path-macosx.m b/osdep/path-macosx.m index 33086c3ea4..ee34f9638b 100644 --- a/osdep/path-macosx.m +++ b/osdep/path-macosx.m @@ -12,8 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along - * with mpv; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * with mpv. If not, see . */ #import diff --git a/osdep/terminal-win.c b/osdep/terminal-win.c index 03a1ba28c6..e6b17fd595 100644 --- a/osdep/terminal-win.c +++ b/osdep/terminal-win.c @@ -2,21 +2,20 @@ * * copyright (C) 2003 Sascha Sommer * - * 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 . */ // See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/winui/WinUI/WindowsUserInterface/UserInput/VirtualKeyCodes.asp diff --git a/osdep/terminal.h b/osdep/terminal.h index 89d4071d93..ebe4cc7ee8 100644 --- a/osdep/terminal.h +++ b/osdep/terminal.h @@ -4,21 +4,20 @@ * * copyright (C) 1999 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 . */ #ifndef MPLAYER_GETCH2_H diff --git a/osdep/timer-linux.c b/osdep/timer-linux.c index 2424cc653d..a3433819be 100644 --- a/osdep/timer-linux.c +++ b/osdep/timer-linux.c @@ -2,21 +2,20 @@ * precise timer routines for Linux/UNIX * copyright (C) LGB & A'rpi/ASTRAL * - * 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/osdep/timer-win2.c b/osdep/timer-win2.c index fbbdc923f1..b87456f3ce 100644 --- a/osdep/timer-win2.c +++ b/osdep/timer-win2.c @@ -1,21 +1,20 @@ /* * precise timer routines for Windows * - * 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/osdep/timer.h b/osdep/timer.h index 2bef4130df..547323943d 100644 --- a/osdep/timer.h +++ b/osdep/timer.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_TIMER_H -- cgit v1.2.3