Commit 159dfd26 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'a435ca5b'

* commit 'a435ca5b':
  doc: Explain that the default RTMP user agent is different when publishing
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 78242e43 a435ca5b
...@@ -423,7 +423,8 @@ times to construct arbitrary AMF sequences. ...@@ -423,7 +423,8 @@ times to construct arbitrary AMF sequences.
@item rtmp_flashver @item rtmp_flashver
Version of the Flash plugin used to run the SWF player. The default Version of the Flash plugin used to run the SWF player. The default
is LNX 9,0,124,2. is LNX 9,0,124,2. (When publishing, the default is FMLE/3.0 (compatible;
<libavformat version>).)
@item rtmp_flush_interval @item rtmp_flush_interval
Number of packets flushed in the same request (RTMPT only). The default Number of packets flushed in the same request (RTMPT only). The default
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment