summaryrefslogtreecommitdiff
path: root/doc/general.texi
diff options
context:
space:
mode:
authorSergiy <piratfm@gmail.com>2009-12-04 16:52:16 +0000
committerKostya Shishkov <kostya.shishkov@gmail.com>2009-12-04 16:52:16 +0000
commit6bf22e18d1357f11048902e2c5ac9f814cd123fa (patch)
tree8ab686f0da2b5f4afa99de6a60fa1ed1502e0acf /doc/general.texi
parentb83ccbffe9b109fcd18dbd178d6b4f300e6d6799 (diff)
Implement RTMP output (publishing FLV stream to RTMP server).
Patch by Sergiy (piratfm at `do-no-evil-mail`.com) Originally committed as revision 20731 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc/general.texi')
-rw-r--r--doc/general.texi3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/general.texi b/doc/general.texi
index 09cd03a24a..17c080488b 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -201,7 +201,8 @@ library:
@item RL2 @tab @tab X
@tab Audio and video format used in some games by Entertainment Software Partners.
@item RPL/ARMovie @tab @tab X
-@item RTMP @tab @tab X
+@item RTMP @tab X @tab X
+ @tab Output is performed by publishing stream to RTMP server
@item RTP @tab @tab X
@item RTSP @tab @tab X
@item SDP @tab @tab X