summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2009-05-06 12:12:05 +0000
committerDiego Biurrun <diego@biurrun.de>2009-05-06 12:12:05 +0000
commit4f3ce007046580d04306430b43fa8985d4285548 (patch)
tree8ac33f9441c16e549854e9724ce2dda43556886f /configure
parentd8ef221893116c8eb5052602878480e2709e33ec (diff)
Merge marking of libfaac as non-free from trunk.
Originally committed as revision 18757 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure1
1 files changed, 1 insertions, 0 deletions
diff --git a/configure b/configure
index 73d80f9e25..0db8a45888 100755
--- a/configure
+++ b/configure
@@ -1695,6 +1695,7 @@ die_license_disabled gpl x11grab
die_license_disabled nonfree libamr_nb
die_license_disabled nonfree libamr_wb
+die_license_disabled nonfree libfaac
check_deps $ARCH_EXT_LIST