diff options
| author | Moritz Barsnick <barsnick@gmx.net> | 2016-08-10 21:18:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-08-14 10:44:38 +0200 |
| commit | d14993478cd9d6274f439f3200ea11c63ff8e0fa (patch) | |
| tree | 17cb0127758030906c8e404b1780cb30be6951f4 | |
| parent | ec4ed2f69c240b901ef1491c752ed425cd7e9618 (diff) | |
| download | ffmpeg-d14993478cd9d6274f439f3200ea11c63ff8e0fa.tar.gz | |
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 <barsnick@gmx.net>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | doc/protocols.texi | 2 | ||||
| -rw-r--r-- | libavformat/http.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/protocols.texi b/doc/protocols.texi index 5767e23f61..470c99ceb4 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 cb5824fabd..adb3d92e21 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: |