diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-13 22:54:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-13 22:54:31 +0200 |
| commit | 313d75cd4300316f6c8de7ef3473275f454e986a (patch) | |
| tree | de3cb7f5e52c196d78ceb9dd140dd25399255203 /doc/protocols.texi | |
| parent | 69a5cd9feac5382c378ff1613f586b37f34d8961 (diff) | |
| parent | 7e38903b5c86a759549e70647ae42bb22d353b14 (diff) | |
Merge commit '7e38903b5c86a759549e70647ae42bb22d353b14'
* commit '7e38903b5c86a759549e70647ae42bb22d353b14':
http: enable icy metadata by default.
Conflicts:
Changelog
libavformat/http.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/protocols.texi')
| -rw-r--r-- | doc/protocols.texi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/protocols.texi b/doc/protocols.texi index 49ca750b76..dc2fdb14fd 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -255,7 +255,7 @@ Export the MIME type. If set to 1 request ICY (SHOUTcast) metadata from the server. If the server supports this, the metadata has to be retrieved by the application by reading the @option{icy_metadata_headers} and @option{icy_metadata_packet} options. -The default is 0. +The default is 1. @item icy_metadata_headers If the server supports ICY metadata, this contains the ICY-specific HTTP reply |