diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-16 06:30:09 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-16 06:30:09 +0400 |
| commit | bdb219435e0bf97bc4c40b84417b8e39b4e49f30 (patch) | |
| tree | 6c66501b4be9c6b4e5e5d79cbde8e1c4f080e968 /doc | |
| parent | a7338ae8acf373244ab28e134f0e09fd745cf383 (diff) | |
| parent | e2811c2ede428a20aec3630bef4378f2927fb306 (diff) | |
Merge commit 'e2811c2ede428a20aec3630bef4378f2927fb306' into release/2.2
* commit 'e2811c2ede428a20aec3630bef4378f2927fb306':
http: Add support reading ICY metadata
Conflicts:
doc/protocols.texi
libavformat/http.c
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 2c842656f3..b82f169c29 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 |