summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2009-05-23 12:58:44 +0000
committerDiego Biurrun <diego@biurrun.de>2009-05-23 12:58:44 +0000
commita4d8ebfaa1ff87a6c2460e4aceaeefb2182c67df (patch)
treec4ae01dadbf66a821bc4001b564af9e3d5cf4e84 /LICENSE
parent0ae7dcae2ce885b42f3944584ca510252a3ce316 (diff)
Merge GPL --> LGPL conversion of AC-3 decoder from trunk.
Originally committed as revision 18915 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5
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