ffmpeg | branch: master | Moritz Barsnick <barsn...@gmx.net> | Wed Aug 10 21:18:00 2016 +0200| [d14993478cd9d6274f439f3200ea11c63ff8e0fa] | committer: Michael Niedermayer
libavformat/http: add support for content_type option in listen mode Instead of silently ignoring the content_type option in listen mode, apply its value to the provided "Content-Type:" header. Signed-off-by: Moritz Barsnick <barsn...@gmx.net> Reviewed-by: Nicolas George <geo...@nsup.org> Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d14993478cd9d6274f439f3200ea11c63ff8e0fa --- doc/protocols.texi | 2 +- libavformat/http.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/protocols.texi b/doc/protocols.texi index 5767e23..470c99c 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -276,7 +276,7 @@ value is -1. If set to 1 use chunked Transfer-Encoding for posts, default is 1. @item content_type -Set a specific content type for the POST messages. +Set a specific content type for the POST messages or for listen mode. @item http_proxy set HTTP proxy to tunnel through e.g. http://example.com:1234 diff --git a/libavformat/http.c b/libavformat/http.c index cb5824f..adb3d92 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -355,7 +355,7 @@ static int http_write_reply(URLContext* h, int status_code) case 200: reply_code = 200; reply_text = "OK"; - content_type = "application/octet-stream"; + content_type = s->content_type ? s->content_type : "application/octet-stream"; break; case AVERROR_HTTP_SERVER_ERROR: case 500: _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
