Mercurial > mplayer.hg
changeset 25426:288d00a5c11e
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))
| author | rik |
|---|---|
| date | Tue, 18 Dec 2007 21:43:12 +0000 |
| parents | ee43314769f4 |
| children | 37a445c4d278 |
| files | libmpcodecs/vd_zrmjpeg.c libmpcodecs/vf_zrmjpeg.c libvo/vo_bl.c libvo/vo_zr.c libvo/vo_zr2.c |
| diffstat | 5 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpcodecs/vd_zrmjpeg.c Tue Dec 18 20:37:20 2007 +0000 +++ b/libmpcodecs/vd_zrmjpeg.c Tue Dec 18 21:43:12 2007 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005 Rik Snel <rsnel@cube.dyndns.org>, license GPL v2 + * Copyright (C) 2005 Rik Snel <rsnel@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@Johanni.de> from the mjpegtools package
--- a/libmpcodecs/vf_zrmjpeg.c Tue Dec 18 20:37:20 2007 +0000 +++ b/libmpcodecs/vf_zrmjpeg.c Tue Dec 18 21:43:12 2007 +0000 @@ -5,7 +5,7 @@ * as by the zr video driver. */ /* - * Copyright (C) 2005 Rik Snel <rsnel@cube.dyndns.org>, license GPL v2 + * Copyright (C) 2005 Rik Snel <rsnel@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 *
--- a/libvo/vo_bl.c Tue Dec 18 20:37:20 2007 +0000 +++ b/libvo/vo_bl.c Tue Dec 18 21:43:12 2007 +0000 @@ -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@schuermans.info>: * - correction of "maxval" in Blinkenlights UDP protcol
--- a/libvo/vo_zr.c Tue Dec 18 20:37:20 2007 +0000 +++ b/libvo/vo_zr.c Tue Dec 18 21:43:12 2007 +0000 @@ -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$ */
--- a/libvo/vo_zr2.c Tue Dec 18 20:37:20 2007 +0000 +++ b/libvo/vo_zr2.c Tue Dec 18 21:43:12 2007 +0000 @@ -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$ */