aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Sabatini <stefasab@gmail.com>2013-06-13 01:29:23 +0200
committerStefano Sabatini <stefasab@gmail.com>2013-06-13 01:40:24 +0200
commit28aed88b7368f63bcf3565a918f7b73498168ac1 (patch)
tree913c17e76f9586affa5496ac0ed6a189f80267d7
parente0135a4bcdc1bc74760c1f2fcd88f92b3445e822 (diff)
downloadffmpeg-28aed88b7368f63bcf3565a918f7b73498168ac1.tar.gz
require --enable-gpl for using the frei0r filter
frei0r license is GPL. Based on a patch by Timothy Gu <timothygu99@gmail.com>. See thread: Subject: [FFmpeg-devel] [PATCH 1/2] LICENSE: Complete GPL'd external libraries list Date: Thu, 6 Jun 2013 18:55:30 -0700
-rw-r--r--LICENSE1
-rwxr-xr-xconfigure1
2 files changed, 2 insertions, 0 deletions
diff --git a/LICENSE b/LICENSE
index a4b400654f..28cb29458c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -73,6 +73,7 @@ compatible libraries
--------------------
The following libraries are under GPL:
+ - frei0r
- libcdio
- libutvideo
- libvidstab
diff --git a/configure b/configure
index 103737d7a7..ff3591993a 100755
--- a/configure
+++ b/configure
@@ -3693,6 +3693,7 @@ die_license_disabled_gpl() {
enabled $1 || { enabled $2 && die "$2 is incompatible with the gpl and --enable-$1 is not specified."; }
}
+die_license_disabled gpl frei0r
die_license_disabled gpl libcdio
die_license_disabled gpl libutvideo
die_license_disabled gpl libvidstab