aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2007-09-09 09:36:32 +0000
committerDiego Biurrun <diego@biurrun.de>2007-09-09 09:36:32 +0000
commit8b5d5864db4a01b219f477a73ed31924d7d5e879 (patch)
treece832ed2d3d092c21cc14bad20bd432ab06667b7
parent7a562a31a34eaff9cffdd3baa4cd378f1f9af389 (diff)
downloadffmpeg-8b5d5864db4a01b219f477a73ed31924d7d5e879.tar.gz
Elaborate on licensing issues: A few files are from libjpeg and the
infamous fdctref.c is all rights reserved. Originally committed as revision 10446 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--README8
1 files changed, 8 insertions, 0 deletions
diff --git a/README b/README
index ebb3629180..3daee7cf6b 100644
--- a/README
+++ b/README
@@ -16,3 +16,11 @@ FFmpeg README
* libpostproc and libswscale are distributed under the GNU General Public
License, see the file COPYING.GPL for details. Their compilation and use
in FFmpeg is optional.
+
+* The files libavcodec/jfdctfst.c, libavcodec/jfdctint.c, libavcodec/jrevdct.c
+ are taken from libjpeg, see the top of the files for licensing details.
+
+* The file libavcodec/fdctref.c is copyrighted by the MPEG Software Simulation
+ Group with all rights reserved. It is only used to create a DCT test program
+ and not compiled into libavcodec.
+