aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2009-02-24 14:53:46 +0000
committerDiego Biurrun <diego@biurrun.de>2009-02-24 14:53:46 +0000
commit75d873314a1746994241fed62018605f1388b41b (patch)
tree8ee57b4991d03f78ed086c3f5e7edd5a54dbfdf7
parent876a4dc0138822466b0fbeb462a5bfacb836031e (diff)
downloadffmpeg-75d873314a1746994241fed62018605f1388b41b.tar.gz
Update information regarding LGPL libswscale.
Originally committed as revision 17553 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--README11
1 files changed, 6 insertions, 5 deletions
diff --git a/README b/README
index 516058caa1..5a5cb16a96 100644
--- a/README
+++ b/README
@@ -10,12 +10,13 @@ FFmpeg README
------------
* Read the file COPYING.LGPL. FFmpeg and the associated libraries EXCEPT
- for libpostproc and libswscale are licensed under the GNU Lesser General
- Public License.
+ for libpostproc are licensed under the GNU Lesser General Public License.
-* 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.
+* libpostproc is distributed under the GNU General Public License, see the
+ file COPYING.GPL for details. Its compilation and use in FFmpeg is optional.
+
+* libswscale contains some optional processor-specific optimizations that are
+ distributed under the GNU General Public License.
* 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