aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorClément Bœsch <ubitux@gmail.com>2012-12-27 22:36:47 +0100
committerClément Bœsch <ubitux@gmail.com>2012-12-30 22:46:42 +0100
commit5c68aae90883497d59a2a49cf75816cf5906e14a (patch)
tree83ede8ebe1751d4d3af4946ff8b8a1bd27a41c54 /doc
parent5f02844c8d4fc93972932a84f0a5cbb02fe12a00 (diff)
downloadffmpeg-5c68aae90883497d59a2a49cf75816cf5906e14a.tar.gz
Add VPlayer subtitles demuxer and decoder.
Note that the linebreaks text codec option (but not the feature) has been removed; its main goal was to allow demuxers to configure the text decoder (and not meant to be used by users), but the AVOption are not a viable solution. This is solved differently in this commit.
Diffstat (limited to 'doc')
-rw-r--r--doc/general.texi1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/general.texi b/doc/general.texi
index 472ceac8ee..de8d080ebc 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -933,6 +933,7 @@ performance on systems without hardware floating point support).
@item SubViewer @tab @tab X @tab @tab X
@item TED Talks captions @tab @tab X @tab @tab X
@item VobSub (IDX+SUB) @tab @tab X @tab @tab X
+@item VPlayer @tab @tab X @tab @tab X
@item WebVTT @tab @tab X @tab @tab X
@item XSUB @tab @tab @tab X @tab X
@end multitable