summaryrefslogtreecommitdiff
path: root/doc/general.texi
diff options
context:
space:
mode:
authorMarton Balint <cus@passwd.hu>2013-09-01 23:05:50 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-09-02 01:19:52 +0200
commitb339dccbba877eb00c4cac2b2761c07f9ba064e6 (patch)
treeaed52ecdc22cf3c04abe46c86251d8aecd305fb8 /doc/general.texi
parentcf942994489210c9509ae811cd4fc0515c872f09 (diff)
lavc: add teletext decoder using libzvbi
Based on a patch by Wolfram Gloger <wmglo@dent.med.uni-muenchen.de>. http://lists.ffmpeg.org/pipermail/ffmpeg-devel/2012-December/136677.html The original patch was rebased by Tudor SUCIU <tudor.suciu@gmail.com>. Lots of additional features and fixes are made by me. Fixes ticket #2086. Changes since last version: - change default page to all pages Signed-off-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/general.texi')
-rw-r--r--doc/general.texi17
1 files changed, 17 insertions, 0 deletions
diff --git a/doc/general.texi b/doc/general.texi
index b755c187ab..2a72d2ed1f 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -133,6 +133,20 @@ Go to @url{https://github.com/dekkers/libilbc} and follow the instructions for
installing the library. Then pass @code{--enable-libilbc} to configure to
enable it.
+@section libzvbi
+
+libzvbi is a VBI decoding library which can be used by FFmpeg to decode DVB
+teletext pages and DVB teletext subtitles.
+
+Go to @url{http://sourceforge.net/projects/zapping/} and follow the instructions for
+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
@chapter Supported File Formats, Codecs or Features
@@ -947,6 +961,7 @@ performance on systems without hardware floating point support).
@item 3GPP Timed Text @tab @tab @tab X @tab X
@item AQTitle @tab @tab X @tab @tab X
@item DVB @tab X @tab X @tab X @tab X
+@item DVB teletext @tab @tab X @tab @tab E
@item DVD @tab X @tab X @tab X @tab X
@item JACOsub @tab X @tab X @tab @tab X
@item MicroDVD @tab X @tab X @tab @tab X
@@ -969,6 +984,8 @@ performance on systems without hardware floating point support).
@code{X} means that the feature is supported.
+@code{E} means that support is provided through an external library.
+
@section Network Protocols
@multitable @columnfractions .4 .1