[MPlayer-cvslog] r25454 - in trunk: libmpcodecs/vd_zrmjpeg.c libmpcodecs/vf_zrmjpeg.c libvo/vo_bl.c libvo/vo_zr.c libvo/vo_zr2.c

[rik]

Author: rik
Date: Tue Dec 18 22:43:12 2007
New Revision: 25454

Log:
change license from GPLv2 to 'GPL v2 or later', requested by Diego, I can do that since I wrote the files (based on other stuff from MPlayer (and some external things under GPL v2 or later))

Modified:
   trunk/libmpcodecs/vd_zrmjpeg.c
   trunk/libmpcodecs/vf_zrmjpeg.c
   trunk/libvo/vo_bl.c
   trunk/libvo/vo_zr.c
   trunk/libvo/vo_zr2.c

Modified: trunk/libmpcodecs/vd_zrmjpeg.c
==============================================================================
--- trunk/libmpcodecs/vd_zrmjpeg.c	(original)
+++ trunk/libmpcodecs/vd_zrmjpeg.c	Tue Dec 18 22:43:12 2007
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005 Rik Snel <rsnel at cube.dyndns.org>, license GPL v2
+ * Copyright (C) 2005 Rik Snel <rsnel at cube.dyndns.org>, license GPL v2 or later
  * - based on vd_mpegpes.c by A'rpi (C) 2002-2003 
  * - guess_mjpeg_type code stolen from lav_io.c (C) 2000 Rainer Johanni
  *   <Rainer at Johanni.de> from the mjpegtools package

Modified: trunk/libmpcodecs/vf_zrmjpeg.c
==============================================================================
--- trunk/libmpcodecs/vf_zrmjpeg.c	(original)
+++ trunk/libmpcodecs/vf_zrmjpeg.c	Tue Dec 18 22:43:12 2007
@@ -5,7 +5,7 @@
  * as by the zr video driver.
  */
 /*
- * Copyright (C) 2005 Rik Snel <rsnel at cube.dyndns.org>, license GPL v2
+ * Copyright (C) 2005 Rik Snel <rsnel at cube.dyndns.org>, license GPL v2 or later
  * - based on vd_lavc.c by A'rpi (C) 2002-2003
  * - parts from ffmpeg Copyright (c) 2000-2003 Fabrice Bellard
  *

Modified: trunk/libvo/vo_bl.c
==============================================================================
--- trunk/libvo/vo_bl.c	(original)
+++ trunk/libvo/vo_bl.c	Tue Dec 18 22:43:12 2007
@@ -10,7 +10,7 @@
  * (these portions are licensed under GNU GPL v2 or "(at your option)
  * any later version")
  * 
- * Other stuff: Copyright (C) Rik Snel 2002, License GNU GPL v2
+ * Other stuff: Copyright (C) Rik Snel 2002, License GNU GPL v2 or later
  *
  * patch from Stefan Schuermans <1stein at schuermans.info>:
  *   - correction of "maxval" in Blinkenlights UDP protcol

Modified: trunk/libvo/vo_zr.c
==============================================================================
--- trunk/libvo/vo_zr.c	(original)
+++ trunk/libvo/vo_zr.c	Tue Dec 18 22:43:12 2007
@@ -1,6 +1,6 @@
 /* 
  * vo_zr.c - playback on zoran cards 
- * Copyright (C) Rik Snel 2001,2002, License GNU GPL v2
+ * Copyright (C) Rik Snel 2001,2002, License GNU GPL v2 or later
  */
 
 /* $Id$ */

Modified: trunk/libvo/vo_zr2.c
==============================================================================
--- trunk/libvo/vo_zr2.c	(original)
+++ trunk/libvo/vo_zr2.c	Tue Dec 18 22:43:12 2007
@@ -1,7 +1,7 @@
 /* 
  * vo_zr2.c - playback on zoran cards 
  * Based on vo_zr.c,v 1.27
- * Copyright (C) Rik Snel 2001-2005, License GNU GPL v2
+ * Copyright (C) Rik Snel 2001-2005, License GNU GPL v2 or later
  */
 
 /* $Id$ */