diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-12 06:16:21 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-12 06:18:12 +0400 |
| commit | ca2369cdee0d75708626d539e9eb8eb7e6f9cce3 (patch) | |
| tree | fab5e47e996f54fcfe0ac5502bed87a553bd8136 /doc | |
| parent | 21d4c571fabe7e0bfc6de8214edb88d733b7624f (diff) | |
| parent | 8075c3d8bb1f6aade0cc7c5c40db9bc1bcd84cab (diff) | |
Merge commit '8075c3d8bb1f6aade0cc7c5c40db9bc1bcd84cab'
* commit '8075c3d8bb1f6aade0cc7c5c40db9bc1bcd84cab':
http: Add support reading ICY metadata
Conflicts:
doc/protocols.texi
libavformat/http.c
See: a92fbe16f2dc118c0d3adc222484268831388648
See: 636273d3d4a8c42f51832e8bf83e566e875916bf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/protocols.texi | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/doc/protocols.texi b/doc/protocols.texi index c39ab614f3..5f6b118dc6 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -213,7 +213,7 @@ m3u8 files. HTTP (Hyper Text Transfer Protocol). -This protocol accepts the following options. +This protocol accepts the following options: @table @option @item seekable @@ -257,12 +257,14 @@ the @option{icy_metadata_headers} and @option{icy_metadata_packet} options. The default is 0. @item icy_metadata_headers -If the server supports ICY metadata, this contains the ICY specific HTTP reply -headers, separated with newline characters. +If the server supports ICY metadata, this contains the ICY-specific HTTP reply +headers, separated by newline characters. @item icy_metadata_packet If the server supports ICY metadata, and @option{icy} was set to 1, this -contains the last non-empty metadata packet sent by the server. +contains the last non-empty metadata packet sent by the server. It should be +polled in regular intervals by applications interested in mid-stream metadata +updates. @item cookies Set the cookies to be sent in future requests. The format of each cookie is the |