]> git.sesse.net Git - ffmpeg/commitdiff
require --enable-gpl for using the frei0r filter
authorStefano Sabatini <stefasab@gmail.com>
Wed, 12 Jun 2013 23:29:23 +0000 (01:29 +0200)
committerStefano Sabatini <stefasab@gmail.com>
Wed, 12 Jun 2013 23:40:24 +0000 (01:40 +0200)
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

LICENSE
configure

diff --git a/LICENSE b/LICENSE
index a4b400654f31dd8d78a6183bca4f441573b13926..28cb29458c4135e813fa84c844f003be3e47eb6f 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -73,6 +73,7 @@ compatible libraries
 --------------------
 
 The following libraries are under GPL:
+    - frei0r
     - libcdio
     - libutvideo
     - libvidstab
index 103737d7a75a8b214f11aeec70bdbafe7a0f3b9a..ff3591993aa3a973ecf8ed0fba3c3ed2d1dc09b4 100755 (executable)
--- 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