From: diego Date: Mon, 23 Feb 2009 01:36:22 +0000 (+0000) Subject: Updates notes about which files are GPL. X-Git-Url: http://rtime.felk.cvut.cz/gitweb/frescor/ffmpeg.git/commitdiff_plain/1e80630a642a17c8ded2bb1c86b67f482139f090 Updates notes about which files are GPL. git-svn-id: file:///var/local/repositories/ffmpeg/trunk@17535 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b --- diff --git a/README b/README index 404c33b1c..516058caa 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.