[FFmpeg-cvslog] Icecast: Use 100-continue if possible for proper error handling

Marvin Scholz git at videolan.org
Tue Nov 11 16:55:41 CET 2014


ffmpeg | branch: master | Marvin Scholz <epirat07 at gmail.com> | Tue Nov 11 02:10:22 2014 +0100| [17dc39e76baf8a481fc8b1d24ee4cf7a6ffe1c1d] | committer: Michael Niedermayer

Icecast: Use 100-continue if possible for proper error handling

Using 100-continue ffmpeg will only send data if the server confirms it,
so if there is an error with auth or mounpoint, this allows that it is
properly reported to the user. Else ffmpeg sends data and just quits at
some point without an error message.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=17dc39e76baf8a481fc8b1d24ee4cf7a6ffe1c1d
---

 libavformat/icecast.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavformat/icecast.c b/libavformat/icecast.c
index 7472416..973c0c2 100644
--- a/libavformat/icecast.c
+++ b/libavformat/icecast.c
@@ -119,6 +119,7 @@ static int icecast_open(URLContext *h, const char *uri, int flags)
         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);
 



More information about the ffmpeg-cvslog mailing list