[FFmpeg-cvslog] require --enable-gpl for using the frei0r filter

Stefano Sabatini git at videolan.org
Thu Jun 13 01:43:10 CEST 2013


ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Thu Jun 13 01:29:23 2013 +0200| [28aed88b7368f63bcf3565a918f7b73498168ac1] | committer: Stefano Sabatini

require --enable-gpl for using the frei0r filter

frei0r license is GPL.

Based on a patch by Timothy Gu <timothygu99 at 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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=28aed88b7368f63bcf3565a918f7b73498168ac1
---

 LICENSE   |    1 +
 configure |    1 +
 2 files changed, 2 insertions(+)

diff --git a/LICENSE b/LICENSE
index a4b4006..28cb294 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 103737d..ff35919 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



More information about the ffmpeg-cvslog mailing list