[FFmpeg-cvslog] r18489 - in branches/0.5: . LICENSE README

[diego]

Author: diego
Date: Mon Apr 13 12:11:31 2009
New Revision: 18489

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

Added:
   branches/0.5/LICENSE
      - copied, changed from r18185, trunk/LICENSE
Modified:
   branches/0.5/   (props changed)
   branches/0.5/README

Copied and modified: branches/0.5/LICENSE (from r18185, trunk/LICENSE)
==============================================================================
--- trunk/LICENSE	Wed Mar 25 15:05:20 2009	(r18185, copy source)
+++ branches/0.5/LICENSE	Mon Apr 13 12:11:31 2009	(r18489)
@@ -25,7 +25,7 @@ as well.
 
 The nonfree external libraries libamrnb and libamrwb can be hooked up in FFmpeg.
 You need to pass --enable-nonfree to configure to enable them. Employ this
-option with care as FFmpeg then beomes nonfree and unredistributable.
+option with care as FFmpeg then becomes nonfree and unredistributable.
 
 There are a handful of files under other licensing terms, namely:
 

Modified: branches/0.5/README
==============================================================================
--- branches/0.5/README	Mon Apr 13 12:00:56 2009	(r18488)
+++ branches/0.5/README	Mon Apr 13 12:11:31 2009	(r18489)
@@ -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.