[SCM] libav/experimental: http: enable icy metadata by default.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 7e38903b5c86a759549e70647ae42bb22d353b14
Author: Andrew Stone <andrew at clovar.com>
Date:   Thu Jul 31 19:56:36 2014 -0400

    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 at khirnov.net>

diff --git a/Changelog b/Changelog
index edba289..4f1507a 100644
--- a/Changelog
+++ b/Changelog
@@ -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 ec7d924..4957aff 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 d729faf..98f41c0 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 },

-- 
Libav/FFmpeg packaging