Mercurial > mplayer.hg

changeset 28106:4932a522100e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace informal GPL notes by standard GPL header.
author diego
date Sat, 13 Dec 2008 12:13:48 +0000
parents 3d8fe3f052be
children f4ff55b427b5
files libmpcodecs/ad_faad.c libmpdemux/parse_mp4.c libmpdemux/parse_mp4.h mangle.h stream/tvi_v4l2.c
diffstat 5 files changed, 107 insertions(+), 32 deletions(-) [+]
line wrap: on
line diff
--- a/libmpcodecs/ad_faad.c	Sat Dec 13 09:53:08 2008 +0000
+++ b/libmpcodecs/ad_faad.c	Sat Dec 13 12:13:48 2008 +0000
@@ -1,7 +1,23 @@
-/* ad_faad.c - MPlayer AAC decoder using libfaad2
- * This file is part of MPlayer, see http://mplayerhq.hu/ for info.  
- * (c)2002 by Felix Buenemann <atmosfear at users.sourceforge.net>
- * File licensed under the GPL, see http://www.fsf.org/ for more info.
+/*
+ * MPlayer AAC decoder using libfaad2
+ *
+ * Copyright (C) 2002 by Felix Buenemann <atmosfear at users.sourceforge.net>
+ *
+ * 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 <stdio.h>
--- a/libmpdemux/parse_mp4.c	Sat Dec 13 09:53:08 2008 +0000
+++ b/libmpdemux/parse_mp4.c	Sat Dec 13 12:13:48 2008 +0000
@@ -1,10 +1,26 @@
-/* parse_mp4.c - MP4 file format parser code
- * This file is part of MPlayer, see http://mplayerhq.hu/ for info.  
- * (c)2002 by Felix Buenemann <atmosfear at users.sourceforge.net>
- * File licensed under the GPL, see http://www.fsf.org/ for more info.
+/*
+ * MP4 file format parser code
+ *
+ * Copyright (C) 2002 by Felix Buenemann <atmosfear at users.sourceforge.net>
  * Code inspired by libmp4 from http://mpeg4ip.sourceforge.net/.
+ *
+ * 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 <stdio.h>
 #include <inttypes.h>
 #ifdef HAVE_MALLOC_H
--- a/libmpdemux/parse_mp4.h	Sat Dec 13 09:53:08 2008 +0000
+++ b/libmpdemux/parse_mp4.h	Sat Dec 13 12:13:48 2008 +0000
@@ -1,7 +1,24 @@
-/* parse_mp4.h - Headerfile for MP4 file format parser code
- * This file is part of MPlayer, see http://mplayerhq.hu/ for info.  
- * (c)2002 by Felix Buenemann <atmosfear at users.sourceforge.net>
- * File licensed under the GPL, see http://www.fsf.org/ for more info.
+/*
+ * MP4 file format parser code
+ *
+ * Copyright (C) 2002 by Felix Buenemann <atmosfear at users.sourceforge.net>
+ * Code inspired by libmp4 from http://mpeg4ip.sourceforge.net/.
+ *
+ * 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.
  */
 
 #ifndef MPLAYER_PARSE_MP4_H
--- a/mangle.h	Sat Dec 13 09:53:08 2008 +0000
+++ b/mangle.h	Sat Dec 13 12:13:48 2008 +0000
@@ -1,7 +1,23 @@
-/* mangle.h - This file has some CPP macros to deal with different symbol
- * mangling across binary formats.
- * (c)2002 by Felix Buenemann <atmosfear at users.sourceforge.net>
- * File licensed under the GPL, see http://www.fsf.org/ for more info.
+/*
+ * CPP macros to deal with different symbol mangling across binary formats.
+ *
+ * Copyright (C) 2002 by Felix Buenemann <atmosfear at users.sourceforge.net>
+ *
+ * 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.
  */
 
 #ifndef MPLAYER_MANGLE_H
--- a/stream/tvi_v4l2.c	Sat Dec 13 09:53:08 2008 +0000
+++ b/stream/tvi_v4l2.c	Sat Dec 13 12:13:48 2008 +0000
@@ -1,19 +1,29 @@
 /*
-**  Video 4 Linux 2 input
-**
-**  This file is part of MPlayer, see http://mplayerhq.hu/ for info.  
-**
-**  (c) 2003 Martin Olschewski <olschewski@zpr.uni-koeln.de>
-**  (c) 2003 Jindrich Makovicka <makovick@gmail.com>
-**  
-**  File licensed under the GPL, see http://www.fsf.org/ for more info.
-**
-**  Some ideas are based on works from
-**    Alex Beregszaszi <alex@fsn.hu>
-**    Gerd Knorr <kraxel@bytesex.org>
-**
-**  CODE IS UNDER DEVELOPMENT, NO FEATURE REQUESTS PLEASE!
-*/
+ * Video 4 Linux 2 input
+ *
+ * copyright (c) 2003 Martin Olschewski <olschewski@zpr.uni-koeln.de>
+ * copyright (c) 2003 Jindrich Makovicka <makovick@gmail.com>
+ *
+ * Some ideas are based on works from
+ *   Alex Beregszaszi <alex@fsn.hu>
+ *   Gerd Knorr <kraxel@bytesex.org>
+ *
+ * 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.
+ */
 
 /*