diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-17 22:28:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-17 22:28:28 +0200 |
| commit | 6ca48ad044e690c43985aa380cb474f1a3df7b4e (patch) | |
| tree | 47a311223209a8edd05242cf417d6b6c61bd83b6 /doc/general.texi | |
| parent | 54101214d89382a24518f21a30080631a981c798 (diff) | |
| parent | 5f26d4d44896542e729c7515c784d983e396106a (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
amr: Cosmetic cleanup
mov_chan: Fix operator precedence by adding parentheses
doc: Add missing protocols to list of supported protocols.
tcp: Check the listen call
Conflicts:
libavformat/amr.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/general.texi')
| -rw-r--r-- | doc/general.texi | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/doc/general.texi b/doc/general.texi index 74092e4ed9..12d7c68962 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -852,19 +852,30 @@ performance on systems without hardware floating point support). @multitable @columnfractions .4 .1 @item Name @tab Support -@item Apple HTTP Live Streaming @tab X @item file @tab X @item Gopher @tab X +@item HLS @tab X @item HTTP @tab X -@item MMS @tab X +@item HTTPS @tab X +@item MMSH @tab X +@item MMST @tab X @item pipe @tab X +@item RTMP @tab X +@item RTMPE @tab E +@item RTMPS @tab E +@item RTMPT @tab E +@item RTMPTE @tab E @item RTP @tab X +@item SCTP @tab X @item TCP @tab X +@item TLS @tab X @item UDP @tab X @end multitable @code{X} means that the protocol is supported. +@code{E} means that support is provided through an external library. + @section Input/Output Devices |