summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2009-02-23 01:36:22 +0000
committerDiego Biurrun <diego@biurrun.de>2009-02-23 01:36:22 +0000
commitb1f58ed4f937b993dba05811104dada6a9df92a3 (patch)
tree8e7c615bcea543e05c013ae0222688ee08a4ca61 /README
parent7c2d92fe08adadeee23179cb29cd9c66677a4137 (diff)
downloadffmpeg-b1f58ed4f937b993dba05811104dada6a9df92a3.tar.gz
Updates notes about which files are GPL.
Originally committed as revision 17535 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'README')
-rw-r--r--README8
1 files changed, 6 insertions, 2 deletions
diff --git a/README b/README
index 404c33b1c5..516058caa1 100644
--- a/README
+++ b/README
@@ -17,8 +17,9 @@ FFmpeg README
License, see the file COPYING.GPL for details. Their compilation and use
in FFmpeg is optional.
-* The file libavcodec/x86/idct_mmx.c is distributed under the GNU General
- Public License. It is strictly an optimization and its use is optional.
+* The files libavcodec/x86/idct_mmx.c, libavcodec/x86/h264_deblock_sse2.asm
+ and libavcodec/x86/h264_idct_sse2.asm are distributed under the GNU General
+ Public License. They are strictly optimizations and their use is optional.
* The file libavcodec/ac3dec.c is distributed under the GNU General Public
License. In order for (E-)AC-3 decoding to work you need to enable GPL
@@ -33,3 +34,6 @@ FFmpeg README
* 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.
+
+* Some external libraries are under GPL. If you wish to use them with FFmpeg,
+ you have to configure FFmpeg as GPL as well.