aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2010-09-10 03:31:24 +0000
committerRonald S. Bultje <rsbultje@gmail.com>2010-09-10 03:31:24 +0000
commit240fd8ef06cdffe09571c17701b44dfa3766bdf9 (patch)
tree5baee933ffb01deee2c15ffaa7990247a0c6dc28
parent8acb554aff34375358204b928a5a28498b135726 (diff)
downloadffmpeg-240fd8ef06cdffe09571c17701b44dfa3766bdf9.tar.gz
Remove h264 asm items off the GPL-only list. They are LGPL now.
Originally committed as revision 25093 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--LICENSE2
1 files changed, 0 insertions, 2 deletions
diff --git a/LICENSE b/LICENSE
index 6aafde8463..8d4d6515b0 100644
--- a/LICENSE
+++ b/LICENSE
@@ -15,8 +15,6 @@ Specifically, the GPL parts of FFmpeg are
- libpostproc
- optional x86 optimizations in the files
- libavcodec/x86/h264_deblock_sse2.asm
- libavcodec/x86/h264_idct_sse2.asm
libavcodec/x86/idct_mmx.c
- the X11 grabber in libavdevice/x11grab.c