# HG changeset patch # User diego # Date 1210788147 0 # Node ID 0f42fb42843cad22645629ee095fdb61b721104e # Parent 0c1db5fd3f79e89b45356a2d8d222e7575203ab4 Use standard license headers with standard formatting. diff -r 0c1db5fd3f79 -r 0f42fb42843c TOOLS/modify_reg.c --- a/TOOLS/modify_reg.c Wed May 14 18:01:51 2008 +0000 +++ b/TOOLS/modify_reg.c Wed May 14 18:02:27 2008 +0000 @@ -1,24 +1,23 @@ /* - * modify_reg.c * A program to modify a registry file. * * Copyright (C) 2007 Alan Nisota * - * This file is part of MPlayer, a free movie player. - * - * MPlayer 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, or (at your option) - * any later version. - * - * MPlayer 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 + * This file is part of MPlayer. + * + * MPlayer 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, + * 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. */ #include diff -r 0c1db5fd3f79 -r 0f42fb42843c TOOLS/netstream.c --- a/TOOLS/netstream.c Wed May 14 18:01:51 2008 +0000 +++ b/TOOLS/netstream.c Wed May 14 18:02:27 2008 +0000 @@ -1,23 +1,21 @@ /* - * netstream.c + * Copyright (C) Alban Bedel - 04/2003 * - * Copyright (C) Alban Bedel - 04/2003 + * This file is part of MPlayer. * - * This file is part of MPlayer, a free movie player. - * - * MPlayer 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, or (at your option) - * any later version. - * - * MPlayer 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 + * MPlayer 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, + * 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. */ #include diff -r 0c1db5fd3f79 -r 0f42fb42843c get_path.h --- a/get_path.h Wed May 14 18:01:51 2008 +0000 +++ b/get_path.h Wed May 14 18:02:27 2008 +0000 @@ -13,9 +13,9 @@ * 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 + * 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. */ #ifndef MPLAYER_GET_PATH_H diff -r 0c1db5fd3f79 -r 0f42fb42843c input/ar.c --- a/input/ar.c Wed May 14 18:01:51 2008 +0000 +++ b/input/ar.c Wed May 14 18:02:27 2008 +0000 @@ -17,9 +17,9 @@ * 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 + * 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. */ #include diff -r 0c1db5fd3f79 -r 0f42fb42843c input/ar.h --- a/input/ar.h Wed May 14 18:01:51 2008 +0000 +++ b/input/ar.h Wed May 14 18:02:27 2008 +0000 @@ -15,9 +15,9 @@ * 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 + * 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. */ #ifndef MPLAYER_AR_H diff -r 0c1db5fd3f79 -r 0f42fb42843c libao2/ao_dsound.c --- a/libao2/ao_dsound.c Wed May 14 18:01:51 2008 +0000 +++ b/libao2/ao_dsound.c Wed May 14 18:02:27 2008 +0000 @@ -1,22 +1,25 @@ -/****************************************************************************** - * ao_dsound.c: Windows DirectSound interface for MPlayer +/* + * Windows DirectSound interface + * * Copyright (c) 2004 Gabor Szecsi * - * This program is free software; you can redistribute it and/or modify + * This file is part of MPlayer. + * + * MPlayer 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, + * MPlayer 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 Street, Fifth Floor, Boston, MA 02110-1301 USA - * - *****************************************************************************/ + * 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. + */ + /** \todo verify/extend multichannel support */ diff -r 0c1db5fd3f79 -r 0f42fb42843c libao2/ao_ivtv.c --- a/libao2/ao_ivtv.c Wed May 14 18:01:51 2008 +0000 +++ b/libao2/ao_ivtv.c Wed May 14 18:02:27 2008 +0000 @@ -1,25 +1,28 @@ /* - * Copyright (C) 2006 Benjamin Zores - * Audio output for WinTV PVR-150/250/350 (a.k.a IVTV) cards. - * through Connexant hardware MPEG decoder. - * See http://ivtvdriver.org/index.php/Main_Page for more details on the - * cards supported by the ivtv driver. + * audio output for WinTV PVR-150/250/350 (a.k.a IVTV) cards + * through Connexant hardware MPEG decoder + * See http://ivtvdriver.org/index.php/Main_Page for more details on the + * cards supported by the ivtv driver. + * + * WARNING: You need to force -ac hwmpa for audio output to work. + * + * Copyright (C) 2006 Benjamin Zores + * + * This file is part of MPlayer. * - * 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. + * MPlayer 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. + * MPlayer 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 Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * WARNING: you need to force -ac hwmpa for audio output to work. + * 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. */ #include diff -r 0c1db5fd3f79 -r 0f42fb42843c libao2/ao_pulse.c --- a/libao2/ao_pulse.c Wed May 14 18:01:51 2008 +0000 +++ b/libao2/ao_pulse.c Wed May 14 18:02:27 2008 +0000 @@ -15,10 +15,11 @@ * 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 + * 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. */ + #include #include diff -r 0c1db5fd3f79 -r 0f42fb42843c libao2/ao_v4l2.c --- a/libao2/ao_v4l2.c Wed May 14 18:01:51 2008 +0000 +++ b/libao2/ao_v4l2.c Wed May 14 18:02:27 2008 +0000 @@ -1,22 +1,25 @@ /* - * Copyright (C) 2007 Benjamin Zores - * Audio output for V4L2 hardware MPEG decoders. + * audio output for V4L2 hardware MPEG decoders * - * 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. + * WARNING: You need to force -ac hwmpa for audio output to work. + * + * Copyright (C) 2007 Benjamin Zores + * + * This file is part of MPlayer. * - * 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. + * MPlayer 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. * - * 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 Street, Fifth Floor, Boston, MA 02110-1301 USA + * MPlayer 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. * - * WARNING: you need to force -ac hwmpa for audio output to work. + * 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. */ #include diff -r 0c1db5fd3f79 -r 0f42fb42843c libao2/ao_win32.c --- a/libao2/ao_win32.c Wed May 14 18:01:51 2008 +0000 +++ b/libao2/ao_win32.c Wed May 14 18:02:27 2008 +0000 @@ -1,22 +1,24 @@ -/****************************************************************************** - * ao_win32.c: Windows waveOut interface for MPlayer - * Copyright (c) 2002 - 2004 Sascha Sommer . +/* + * Windows waveOut interface * - * This program is free software; you can redistribute it and/or modify + * Copyright (c) 2002 - 2004 Sascha Sommer + * + * This file is part of MPlayer. + * + * MPlayer 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, + * MPlayer 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 Street, Fifth Floor, Boston, MA 02110-1301 USA - * - *****************************************************************************/ + * 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. + */ #include #include diff -r 0c1db5fd3f79 -r 0f42fb42843c libmenu/menu_chapsel.c --- a/libmenu/menu_chapsel.c Wed May 14 18:01:51 2008 +0000 +++ b/libmenu/menu_chapsel.c Wed May 14 18:02:27 2008 +0000 @@ -16,9 +16,9 @@ * 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 + * 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. */ #include diff -r 0c1db5fd3f79 -r 0f42fb42843c metadata.h --- a/metadata.h Wed May 14 18:01:51 2008 +0000 +++ b/metadata.h Wed May 14 18:02:27 2008 +0000 @@ -1,20 +1,23 @@ /* - * Copyright (C) 2006 Benjamin Zores - * Set of helper routines for stream metadata and properties retrieval. + * set of helper routines for stream metadata and properties retrieval * - * 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. + * Copyright (C) 2006 Benjamin Zores + * + * This file is part of MPlayer. * - * 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. + * MPlayer 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. * - * 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 Street, Fifth Floor, Boston, MA 02110-1301 USA + * MPlayer 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. */ #ifndef MPLAYER_METADATA_H diff -r 0c1db5fd3f79 -r 0f42fb42843c unrar_exec.c --- a/unrar_exec.c Wed May 14 18:01:51 2008 +0000 +++ b/unrar_exec.c Wed May 14 18:02:27 2008 +0000 @@ -16,9 +16,9 @@ * 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 + * 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. */ #include diff -r 0c1db5fd3f79 -r 0f42fb42843c unrar_exec.h --- a/unrar_exec.h Wed May 14 18:01:51 2008 +0000 +++ b/unrar_exec.h Wed May 14 18:02:27 2008 +0000 @@ -16,9 +16,9 @@ * 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 + * 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. */ #ifndef MPLAYER_UNRAR_EXEC_H