summaryrefslogtreecommitdiffstats
path: root/doc/general.texi
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2010-07-24 22:50:12 +0000
committerAurelien Jacobs <aurel@gnuage.org>2010-07-24 22:50:12 +0000
commitba2c508d0c7192e623fe835b3dea9328fdc0f03b (patch)
tree85adc3c7429dc5eb66dbe4ea52d2d3641b7ed916 /doc/general.texi
parente3f7bf774caad334b258f4494e77420a7c161b63 (diff)
downloadffmpeg-streaming-ba2c508d0c7192e623fe835b3dea9328fdc0f03b.zip
ffmpeg-streaming-ba2c508d0c7192e623fe835b3dea9328fdc0f03b.tar.gz
add SubRip muxer and demuxer
Originally committed as revision 24488 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc/general.texi')
-rw-r--r--doc/general.texi1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/general.texi b/doc/general.texi
index 76c676f..a8a5444 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -684,6 +684,7 @@ performance on systems without hardware floating point support).
@item DVB @tab X @tab X @tab X @tab X
@item DVD @tab X @tab X @tab X @tab X
@item PGS @tab @tab @tab @tab X
+@item SubRip (SRT) @tab X @tab X
@item XSUB @tab @tab @tab X @tab X
@end multitable
OpenPOWER on IntegriCloud