summaryrefslogtreecommitdiffstats
path: root/Copyright
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-10-31 17:07:55 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-10-31 17:07:55 +0000
commit4edb4a72d6c8e3bd031505a27363c8c6df6eb0e8 (patch)
tree0d0391b43d5b6606ee24750574321aef95f99e56 /Copyright
parentd8309def0a3b794a5e86ede6256edae1b6fb51df (diff)
downloadmpv-4edb4a72d6c8e3bd031505a27363c8c6df6eb0e8.tar.bz2
mpv-4edb4a72d6c8e3bd031505a27363c8c6df6eb0e8.tar.xz
CVS -> SVN for FFmpeg, add pnm implementation from xine.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20566 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Copyright')
-rw-r--r--Copyright8
1 files changed, 7 insertions, 1 deletions
diff --git a/Copyright b/Copyright
index b80aaa3818..119e814646 100644
--- a/Copyright
+++ b/Copyright
@@ -8,7 +8,7 @@ notices can be found in the file headers. Furthermore, MPlayer includes code
from several external sources:
Name: FFmpeg
-Version: CVS snapshot
+Version: Subversion HEAD
Homepage: http://www.ffmpeg.org
Directory: libavcodec, libavformat, libavutil, libpostproc
License: GNU Lesser General Public License, some parts GNU General Public
@@ -92,6 +92,12 @@ Homepage: http://www.xinehq.de
Directory: stream/realrtsp/
License: GNU General Public License
+Name: pnm protocol implementation
+Version: xine CVS 2002/12/26 + patches
+Homepage: http://www.xinehq.de
+Directory: stream/pnm.[ch]
+License: GNU General Public License
+
Name: id3edit
Version: 1.9 + patches
Homepage: http://id3edit.sourceforge.net/