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 | |
| parent | 69a5cd9feac5382c378ff1613f586b37f34d8961 (diff) | |
| parent | 7e38903b5c86a759549e70647ae42bb22d353b14 (diff) | |
| download | ffmpeg-313d75cd4300316f6c8de7ef3473275f454e986a.tar.gz | |
Merge commit '7e38903b5c86a759549e70647ae42bb22d353b14'
* commit '7e38903b5c86a759549e70647ae42bb22d353b14':
http: enable icy metadata by default.
Conflicts:
Changelog
libavformat/http.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | Changelog | 1 | ||||
| -rw-r--r-- | doc/protocols.texi | 2 | ||||
| -rw-r--r-- | libavformat/http.c | 2 |
3 files changed, 3 insertions, 2 deletions
@@ -5,6 +5,7 @@ version <next>: - Icecast protocol - ported lenscorrection filter from frei0r filter - large optimizations in dctdnoiz to make it usable +- request icecast metadata by default version 2.3: 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 diff --git a/libavformat/http.c b/libavformat/http.c index 10c7c91f53..adbd01cb83 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -111,7 +111,7 @@ static const AVOption options[] = { { "post_data", "set custom HTTP post data", OFFSET(post_data), AV_OPT_TYPE_BINARY, .flags = D | E }, { "mime_type", "export the MIME type", OFFSET(mime_type), AV_OPT_TYPE_STRING, { 0 }, 0, 0, AV_OPT_FLAG_EXPORT | AV_OPT_FLAG_READONLY }, { "cookies", "set cookies to be sent in applicable future requests, use newline delimited Set-Cookie HTTP field value syntax", OFFSET(cookies), AV_OPT_TYPE_STRING, { 0 }, 0, 0, D }, - { "icy", "request ICY metadata", OFFSET(icy), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, D }, + { "icy", "request ICY metadata", OFFSET(icy), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 1, D }, { "icy_metadata_headers", "return ICY metadata headers", OFFSET(icy_metadata_headers), AV_OPT_TYPE_STRING, { 0 }, 0, 0, AV_OPT_FLAG_EXPORT }, { "icy_metadata_packet", "return current ICY metadata packet", OFFSET(icy_metadata_packet), AV_OPT_TYPE_STRING, { 0 }, 0, 0, AV_OPT_FLAG_EXPORT }, { "metadata", "metadata read from the bitstream", OFFSET(metadata), AV_OPT_TYPE_DICT, {0}, 0, 0, AV_OPT_FLAG_EXPORT }, |