diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-15 11:28:06 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-15 11:30:42 +0100 |
commit | f3c324a0fefd1a2dd4eff0be2e0d075d359d6235 (patch) | |
tree | 15459162bfe1b6b9d80748c1b370a327123f1190 | |
parent | 05e4b25e9b0a3586033dc21548b03c8e5071efe3 (diff) | |
parent | 3a6bb9735053c453f806ceab1d91124648d90aca (diff) | |
download | ffmpeg-f3c324a0fefd1a2dd4eff0be2e0d075d359d6235.tar.gz |
Merge commit '3a6bb9735053c453f806ceab1d91124648d90aca'
* commit '3a6bb9735053c453f806ceab1d91124648d90aca':
Icecast: Send 100-continue header if possible
See: 17dc39e76baf8a481fc8b1d24ee4cf7a6ffe1c1d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libavformat/icecast.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/icecast.c b/libavformat/icecast.c index 973c0c26a2..a7c7001f03 100644 --- a/libavformat/icecast.c +++ b/libavformat/icecast.c @@ -115,11 +115,11 @@ static int icecast_open(URLContext *h, const char *uri, int flags) av_dict_set(&opt_dict, "auth_type", "basic", 0); av_dict_set(&opt_dict, "headers", headers, 0); av_dict_set(&opt_dict, "chunked_post", "0", 0); + av_dict_set(&opt_dict, "send_expect_100", s->legacy_icecast ? "0" : "1", 0); if (NOT_EMPTY(s->content_type)) av_dict_set(&opt_dict, "content_type", s->content_type, 0); else av_dict_set(&opt_dict, "content_type", "audio/mpeg", 0); - av_dict_set(&opt_dict, "send_expect_100", s->legacy_icecast ? "0" : "1", 0); if (NOT_EMPTY(s->user_agent)) av_dict_set(&opt_dict, "user_agent", s->user_agent, 0); |