Commit 72dc13d0 authored by diego's avatar diego

Clarify that our LGPL/GPL licenses come with an explicit "or later" clause.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18184 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent e7264e02
...@@ -10,24 +10,27 @@ FFmpeg README ...@@ -10,24 +10,27 @@ FFmpeg README
------------ ------------
* Read the file COPYING.LGPL. FFmpeg and the associated libraries EXCEPT * Read the file COPYING.LGPL. FFmpeg and the associated libraries EXCEPT
for libpostproc are licensed under the GNU Lesser General Public License. for libpostproc are licensed under the GNU Lesser General Public License
version 2.1 or later.
* libpostproc is distributed under the GNU General Public License, see the * libpostproc is distributed under the GNU General Public License version 2
file COPYING.GPL for details. Its compilation and use in FFmpeg is optional. or later, see the file COPYING.GPL for details. Its compilation and use in
FFmpeg is optional.
* libswscale contains some optional processor-specific optimizations that are * libswscale contains some optional processor-specific optimizations that are
distributed under the GNU General Public License. distributed under the GNU General Public License version 2 or later.
* The files libavcodec/x86/idct_mmx.c, libavcodec/x86/h264_deblock_sse2.asm * 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 and libavcodec/x86/h264_idct_sse2.asm are distributed under the GNU General
Public License. They are strictly optimizations and their use is optional. Public License version 2 or later. They are strictly optimizations and
their use is optional.
* The file libavcodec/ac3dec.c is distributed under the GNU General Public * 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 License version 2 or later. In order for (E-)AC-3 decoding to work you
components. need to enable GPL components.
* The file libavdevice/x11grab.c is distributed under the GNU General * The file libavdevice/x11grab.c is distributed under the GNU General
Public License. X11 grabbing is optional. Public License version 2 or later. X11 grabbing is optional.
* The files libavcodec/jfdctfst.c, libavcodec/jfdctint.c, libavcodec/jrevdct.c * The files libavcodec/jfdctfst.c, libavcodec/jfdctint.c, libavcodec/jrevdct.c
are taken from libjpeg, see the top of the files for licensing details. are taken from libjpeg, see the top of the files for licensing details.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment