aboutsummaryrefslogtreecommitdiffstats
path: root/LICENSE
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2009-05-19 22:58:09 +0000
committerDiego Biurrun <diego@biurrun.de>2009-05-19 22:58:09 +0000
commit1754fe4d3070d2f5fbc9b0ebc3168b3c328ba864 (patch)
tree39d5b86a533bd950c70c4a01bc87182e717a2ab3 /LICENSE
parentd869a460dbdc6efbafbf74d1a2ef14eae367179e (diff)
downloadffmpeg-1754fe4d3070d2f5fbc9b0ebc3168b3c328ba864.tar.gz
The AC-3 decoder is now LGPL. Exchange the license header and change references
in the build system and documentation that mark it as GPL. Originally committed as revision 18876 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE1
1 files changed, 0 insertions, 1 deletions
diff --git a/LICENSE b/LICENSE
index 7c0a3e71b6..929f65bebc 100644
--- a/LICENSE
+++ b/LICENSE
@@ -16,7 +16,6 @@ Specifically, the GPL parts of FFmpeg are
libavcodec/x86/h264_deblock_sse2.asm
libavcodec/x86/h264_idct_sse2.asm
libavcodec/x86/idct_mmx.c
-- the AC-3 decoder in libavcodec/ac3dec.c
- the X11 grabber in libavdevice/x11grab.c
Some external libraries, e.g. libx264, are under GPL and can be used in