path: root/stream
diff options
authorwm4 <wm4@nowhere>2013-10-13 01:18:50 +0200
committerwm4 <wm4@nowhere>2013-10-13 01:36:10 +0200
commita5507312093adb99fc80f09276561eb333999cba (patch)
tree1c3e3486f0de52ff74d9d42603090f7404343a79 /stream
parent0933f12d28ec82776550032cce32e505b2d3e3c6 (diff)
Copyright, LICENSE: switch to GPL version 2 or later
Now that talloc has been removed, the license can be switched back to GPLv2+. Actually, there never was a GPLv2+ licensed MPlayer (fork or not) until now, but removal of some GPLv2-only code makes this possible now. Rewrite the Copyright file to explain the reasons for the licenses MPlayer and forks use. The old Copyright file didn't contain anything interesting anymore, and all information it contained is available at other places in the source tree. The reason for the license change itself is that it should improve interoperability with differently licensed code in general. This essentially reverts commit 1752808.
Diffstat (limited to 'stream')
1 files changed, 2 insertions, 1 deletions
diff --git a/stream/stream_dvb.c b/stream/stream_dvb.c
index af79a727eb..2114652ec5 100644
--- a/stream/stream_dvb.c
+++ b/stream/stream_dvb.c
@@ -5,7 +5,8 @@ dvbstream
Original authors: Nico, probably Arpi
-The latest version can be found at
+Some code based on dvbstream, 0.4.3-pre3 (CVS checkout),
Modified for use with MPlayer, for details see the changelog at