Merge split of README <-> LICENSE files along with the clarifications.

Originally committed as revision 18489 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

1 files changed, 1 insertions, 29 deletions

diff --git a/README b/README
index 5a5cb16a96..e907e90223 100644
--- a/README
+++ b/README
@@ -9,32 +9,4 @@ FFmpeg README
 2) Licensing
 ------------
 
-* Read the file COPYING.LGPL. FFmpeg and the associated libraries EXCEPT
-  for libpostproc are licensed under the GNU Lesser General Public License.
-
-* 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
-  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
-  components.
-
-* The file libavdevice/x11grab.c is distributed under the GNU General
-  Public License. X11 grabbing 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.
-
-* Some external libraries are under GPL. If you wish to use them with FFmpeg,
-  you have to configure FFmpeg as GPL as well.
+* See the LICENSE file.