Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarton Balint <cus@passwd.hu>2016-01-14 05:34:57 +0300
committerMarton Balint <cus@passwd.hu>2016-01-29 03:42:17 +0300
commit6bc610b39efed743a8616104ce59c860f20487ef (patch)
treef67e22c85f995cd61f1353e67c882f48003cb635 /doc/general.texi
parent995c7a6f5ad480d706b22e97609e2cce2f305e4b (diff)
configure: remove libzvbi GPL dependency
The COPYING.LIB file in the zvbi source tree as well as libzvbi.h references the GNU Library General Public License version 2 since version 0.2.28. Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'doc/general.texi')
-rw-r--r--doc/general.texi6
1 files changed, 0 insertions, 6 deletions
diff --git a/doc/general.texi b/doc/general.texi
index 06933abdb4..6f40671e9d 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -173,12 +173,6 @@ Go to @url{http://sourceforge.net/projects/zapping/} and follow the instructions
installing the library. Then pass @code{--enable-libzvbi} to configure to
enable it.
-@float NOTE
-libzvbi is licensed under the GNU General Public License Version 2 or later
-(see @url{http://www.gnu.org/licenses/old-licenses/gpl-2.0.html} for details),
-you must upgrade FFmpeg's license to GPL in order to use it.
-@end float
-
@section AviSynth
FFmpeg can read AviSynth scripts as input. To enable support, pass