The COPYING.LIB file in the zvbi source tree as well as libzvbi.h references
the GNU Library General Public License version 2.
Signed-off-by: Marton Balint <c...@passwd.hu>
---
configure | 1 -
doc/general.texi | 6 ------
2 files changed, 7 deletions(-)
diff --git a/configure b/configure
index 450c574..e7fea77 100755
--- a/configure
+++ b/configure
@@ -4851,7 +4851,6 @@ die_license_disabled gpl libx264
die_license_disabled gpl libx265
die_license_disabled gpl libxavs
die_license_disabled gpl libxvid
-die_license_disabled gpl libzvbi
die_license_disabled gpl x11grab
die_license_disabled nonfree libaacplus
diff --git a/doc/general.texi b/doc/general.texi
index 06933ab..6f40671 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
--
2.6.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
