ffmpeg | branch: master | Marvin Scholz <epira...@gmail.com> | Tue Nov 11 02:39:40 2014 +0100| [8562c1483ba647f562e4c1df68a9231274b80e6b] | committer: Anton Khirnov
Icecast: Send content-type in all cases This is needed because Icecast since version 2.4.1 doesn't default to audio/mpeg anymore. AVOption default not used here, since a later check if -content_type is set is performed and would break. Signed-off-by: Anton Khirnov <an...@khirnov.net> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8562c1483ba647f562e4c1df68a9231274b80e6b --- libavformat/icecast.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/icecast.c b/libavformat/icecast.c index 1dc08ab..5e3ce66 100644 --- a/libavformat/icecast.c +++ b/libavformat/icecast.c @@ -130,6 +130,8 @@ static int icecast_open(URLContext *h, const char *uri, int flags) 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); if (NOT_EMPTY(s->user_agent)) av_dict_set(&opt_dict, "user_agent", s->user_agent, 0); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
