summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libmpcodecs/vd_zrmjpeg.c2
-rw-r--r--libmpcodecs/vf_zrmjpeg.c2
-rw-r--r--libvo/vo_bl.c2
-rw-r--r--libvo/vo_zr.c2
-rw-r--r--libvo/vo_zr2.c2
5 files changed, 5 insertions, 5 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
*
diff --git a/libvo/vo_bl.c b/libvo/vo_bl.c
index 2adb83cb31..23981d7eea 100644
--- a/libvo/vo_bl.c
+++ b/libvo/vo_bl.c
@@ -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
diff --git a/libvo/vo_zr.c b/libvo/vo_zr.c
index 2271be256b..1cbca990fd 100644
--- a/libvo/vo_zr.c
+++ b/libvo/vo_zr.c
@@ -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$ */
diff --git a/libvo/vo_zr2.c b/libvo/vo_zr2.c
index c032573e6f..7904d6f098 100644
--- a/libvo/vo_zr2.c
+++ b/libvo/vo_zr2.c
@@ -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$ */