summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2009-07-05 20:35:02 +0000
committerDiego Biurrun <diego@biurrun.de>2009-07-05 20:35:02 +0000
commit93229681b53ce6c857f41f2e585d03512320f7aa (patch)
tree92eef5f5dda4e0c9242b52234d2df249a41e4f10 /configure
parent8819b9c600b0e18367ad577e634a6e0bb8879fea (diff)
Merge remaining changes to make libswscale usable in LGPL mode from trunk.
Originally committed as revision 19352 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure1
1 files changed, 0 insertions, 1 deletions
diff --git a/configure b/configure
index 9181e792a7..fd11501e22 100755
--- a/configure
+++ b/configure
@@ -1699,7 +1699,6 @@ die_license_disabled gpl libfaad2
die_license_disabled gpl libx264
die_license_disabled gpl libxvid
die_license_disabled gpl postproc
-die_license_disabled gpl swscale
die_license_disabled gpl x11grab
die_license_disabled nonfree libamr_nb