diff options
| author | rik <rik@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-12-18 21:43:12 +0000 |
|---|---|---|
| committer | rik <rik@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-12-18 21:43:12 +0000 |
| commit | b15fe151d6758b7a7c05873076b3a44b5b82b077 (patch) | |
| tree | 47a0d937071189c0e121bdf7a946af8f79d5611f /libmpcodecs | |
| parent | f61d6fc9871359deff5eb66692691e24f8467c33 (diff) | |
| download | mpv-b15fe151d6758b7a7c05873076b3a44b5b82b077.tar.bz2 mpv-b15fe151d6758b7a7c05873076b3a44b5b82b077.tar.xz | |
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))
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25454 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vd_zrmjpeg.c | 2 | ||||
| -rw-r--r-- | libmpcodecs/vf_zrmjpeg.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libmpcodecs/vd_zrmjpeg.c b/libmpcodecs/vd_zrmjpeg.c index 660b306b25..e4f51d9096 100644 --- a/libmpcodecs/vd_zrmjpeg.c +++ b/libmpcodecs/vd_zrmjpeg.c @@ -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 diff --git a/libmpcodecs/vf_zrmjpeg.c b/libmpcodecs/vf_zrmjpeg.c index 6f62d5efa4..91a88eb9b1 100644 --- a/libmpcodecs/vf_zrmjpeg.c +++ b/libmpcodecs/vf_zrmjpeg.c @@ -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 * |