diff options
-rw-r--r-- | TOOLS/modify_reg.c | 31 | ||||
-rw-r--r-- | TOOLS/netstream.c | 32 | ||||
-rw-r--r-- | get_path.h | 6 | ||||
-rw-r--r-- | input/ar.c | 6 | ||||
-rw-r--r-- | input/ar.h | 6 | ||||
-rw-r--r-- | libao2/ao_dsound.c | 21 | ||||
-rw-r--r-- | libao2/ao_ivtv.c | 37 | ||||
-rw-r--r-- | libao2/ao_pulse.c | 7 | ||||
-rw-r--r-- | libao2/ao_v4l2.c | 31 | ||||
-rw-r--r-- | libao2/ao_win32.c | 22 | ||||
-rw-r--r-- | libmenu/menu_chapsel.c | 6 | ||||
-rw-r--r-- | metadata.h | 29 | ||||
-rw-r--r-- | unrar_exec.c | 6 | ||||
-rw-r--r-- | unrar_exec.h | 6 |
14 files changed, 129 insertions, 117 deletions
diff --git a/TOOLS/modify_reg.c b/TOOLS/modify_reg.c index 6a05422b47..2bd40a91f0 100644 --- a/TOOLS/modify_reg.c +++ b/TOOLS/modify_reg.c @@ -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 <unistd.h> diff --git a/TOOLS/netstream.c b/TOOLS/netstream.c index a2b5bd3768..d536dc6373 100644 --- a/TOOLS/netstream.c +++ b/TOOLS/netstream.c @@ -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 <stdlib.h> diff --git a/get_path.h b/get_path.h index df81c48fd9..09eef7b933 100644 --- a/get_path.h +++ b/get_path.h @@ -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 --git a/input/ar.c b/input/ar.c index 7347b4c326..61a6de0c6d 100644 --- a/input/ar.c +++ b/input/ar.c @@ -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 <IOKit/IOCFPlugIn.h> diff --git a/input/ar.h b/input/ar.h index 836ba089d1..10c6aac7a4 100644 --- a/input/ar.h +++ b/input/ar.h @@ -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 --git a/libao2/ao_dsound.c b/libao2/ao_dsound.c index d66de37ec5..acd59983dd 100644 --- a/libao2/ao_dsound.c +++ b/libao2/ao_dsound.c @@ -1,22 +1,25 @@ -/****************************************************************************** - * ao_dsound.c: Windows DirectSound interface for MPlayer +/* + * Windows DirectSound interface + * * Copyright (c) 2004 Gabor Szecsi <deje@miki.hu> * - * 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 --git a/libao2/ao_ivtv.c b/libao2/ao_ivtv.c index ea57bcf9c4..4d1d578ba0 100644 --- a/libao2/ao_ivtv.c +++ b/libao2/ao_ivtv.c @@ -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. * - * 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. * - * 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. + * Copyright (C) 2006 Benjamin Zores * - * 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 + * This file is part of MPlayer. * - * WARNING: you need to force -ac hwmpa for audio output to work. + * 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 <inttypes.h> diff --git a/libao2/ao_pulse.c b/libao2/ao_pulse.c index 4fbd0fc5c4..827dab92db 100644 --- a/libao2/ao_pulse.c +++ b/libao2/ao_pulse.c @@ -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 <string.h> #include <pulse/pulseaudio.h> diff --git a/libao2/ao_v4l2.c b/libao2/ao_v4l2.c index 6dca333c1d..dc63003b06 100644 --- a/libao2/ao_v4l2.c +++ b/libao2/ao_v4l2.c @@ -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. * - * 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. + * Copyright (C) 2007 Benjamin Zores * - * 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 + * This file is part of MPlayer. * - * WARNING: you need to force -ac hwmpa for audio output to work. + * 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 <inttypes.h> diff --git a/libao2/ao_win32.c b/libao2/ao_win32.c index 71146b43a2..40830eb233 100644 --- a/libao2/ao_win32.c +++ b/libao2/ao_win32.c @@ -1,22 +1,24 @@ -/****************************************************************************** - * ao_win32.c: Windows waveOut interface for MPlayer - * Copyright (c) 2002 - 2004 Sascha Sommer <saschasommer@freenet.de>. +/* + * Windows waveOut interface * - * This program is free software; you can redistribute it and/or modify + * Copyright (c) 2002 - 2004 Sascha Sommer <saschasommer@freenet.de> + * + * 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 <stdio.h> #include <stdlib.h> diff --git a/libmenu/menu_chapsel.c b/libmenu/menu_chapsel.c index 825524531b..707908a016 100644 --- a/libmenu/menu_chapsel.c +++ b/libmenu/menu_chapsel.c @@ -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 <stdlib.h> diff --git a/metadata.h b/metadata.h index 6cd75ea3e0..6a31d75f4b 100644 --- a/metadata.h +++ b/metadata.h @@ -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 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. + * This file is part of MPlayer. * - * 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 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. */ #ifndef MPLAYER_METADATA_H diff --git a/unrar_exec.c b/unrar_exec.c index de2b230e81..db59d9adc7 100644 --- a/unrar_exec.c +++ b/unrar_exec.c @@ -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 <sys/wait.h> diff --git a/unrar_exec.h b/unrar_exec.h index dfe9e56191..5754083fd7 100644 --- a/unrar_exec.h +++ b/unrar_exec.h @@ -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 |