summaryrefslogtreecommitdiff
path: root/libavformat/icecast.c
diff options
context:
space:
mode:
authorMarvin Scholz <epirat07@gmail.com>2020-06-14 00:52:44 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2020-07-02 17:14:31 +0200
commitc0c45e238f126a28d91d48ee625a732f6fee1a88 (patch)
tree786eac654c2759c3a61c6a99c462efc592b9dd5f /libavformat/icecast.c
parent0e10f54585e40a03ea8f19deed50dbf61c8055bc (diff)
downloadffmpeg-c0c45e238f126a28d91d48ee625a732f6fee1a88.tar.gz
avformat/icecast: Add option to use TLS connection
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/icecast.c')
-rw-r--r--libavformat/icecast.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/libavformat/icecast.c b/libavformat/icecast.c
index 38af16b99e..b06c53cabd 100644
--- a/libavformat/icecast.c
+++ b/libavformat/icecast.c
@@ -43,6 +43,7 @@ typedef struct IcecastContext {
int public;
char *url;
char *user_agent;
+ int tls;
} IcecastContext;
#define DEFAULT_ICE_USER "source"
@@ -62,6 +63,7 @@ static const AVOption options[] = {
{ "password", "set password", OFFSET(pass), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, E },
{ "content_type", "set content-type, MUST be set if not audio/mpeg", OFFSET(content_type), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, E },
{ "legacy_icecast", "use legacy SOURCE method, for Icecast < v2.4", OFFSET(legacy_icecast), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, E },
+ { "tls", "use a TLS connection", OFFSET(tls), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, E },
{ NULL }
};
@@ -162,7 +164,9 @@ static int icecast_open(URLContext *h, const char *uri, int flags)
}
// Build new URI for passing to http protocol
- ff_url_join(h_url, sizeof(h_url), "http", auth, host, port, "%s", path);
+ ff_url_join(h_url, sizeof(h_url),
+ s->tls ? "https" : "http",
+ auth, host, port, "%s", path);
// Finally open http proto handler
ret = ffurl_open_whitelist(&s->hd, h_url, AVIO_FLAG_READ_WRITE, NULL,
&opt_dict, h->protocol_whitelist, h->protocol_blacklist, h);