diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-11 11:28:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-11 11:28:54 +0200 |
| commit | 159dfd26259dbfc6b221447c24ea14f0a659f6a0 (patch) | |
| tree | 513ff8e107ea31664a2038c225259cfde5902713 /doc | |
| parent | 78242e431028de946cdd5c17dfbf95b0f187e507 (diff) | |
| parent | a435ca5b4d9efebf0759220681010977c36615f7 (diff) | |
| download | ffmpeg-159dfd26259dbfc6b221447c24ea14f0a659f6a0.tar.gz | |
Merge commit 'a435ca5b4d9efebf0759220681010977c36615f7'
* commit 'a435ca5b4d9efebf0759220681010977c36615f7':
doc: Explain that the default RTMP user agent is different when publishing
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/protocols.texi | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/protocols.texi b/doc/protocols.texi index 777d9e1a26..dcd65e8aac 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -423,7 +423,8 @@ times to construct arbitrary AMF sequences. @item rtmp_flashver 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 Number of packets flushed in the same request (RTMPT only). The default |