diff options
| author | Andrew Stone <andrew@clovar.com> | 2014-07-31 19:56:36 -0400 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2014-08-13 16:10:15 +0000 |
| commit | 7e38903b5c86a759549e70647ae42bb22d353b14 (patch) | |
| tree | cc3ba7d02f1db8870d6c76b0c4fa3b7c4fb7f31d | |
| parent | 7601f9412a2d3387617a45966b65b452a632c27a (diff) | |
| download | ffmpeg-7e38903b5c86a759549e70647ae42bb22d353b14.tar.gz | |
http: enable icy metadata by default.
It won't hurt servers that don't care about the header,
and those that do will include it by default.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
| -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
@@ -29,6 +29,7 @@ version <next>: - display matrix export and rotation api - drop avserver, it was unmaintained for years and largely broken - Icecast protocol +- request icecast metadata by default version 10: diff --git a/doc/protocols.texi b/doc/protocols.texi index ec7d92440a..4957aff081 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -119,7 +119,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 d729fafc87..98f41c0b0a 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -105,7 +105,7 @@ static const AVOption options[] = { { "multiple_requests", "use persistent connections", OFFSET(multiple_requests), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, D | E }, { "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 }, - { "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 }, |