diff options
author | Diego Biurrun <diego@biurrun.de> | 2009-02-24 14:53:46 +0000 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2009-02-24 14:53:46 +0000 |
commit | 75d873314a1746994241fed62018605f1388b41b (patch) | |
tree | 8ee57b4991d03f78ed086c3f5e7edd5a54dbfdf7 /README | |
parent | 876a4dc0138822466b0fbeb462a5bfacb836031e (diff) | |
download | ffmpeg-75d873314a1746994241fed62018605f1388b41b.tar.gz |
Update information regarding LGPL libswscale.
Originally committed as revision 17553 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'README')
-rw-r--r-- | README | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -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 |