Merge remote-tracking branch 'origin/master'

diff --git a/server.cpp b/server.cpp
index bfdee5a40906417000365a638269cbfd0a094ce9..08f2afdfc907c38d8858de1715b46ce0ac2c179a 100644 (file)
--- a/server.cpp
+++ b/server.cpp
@@ -263,7 +263,7 @@ void Server::parse_request(Client *client)
        client->request.clear();
 
        // Construct the header.
-       client->header = "HTTP/1.0 200 OK\r\nContent-type: todo/fixme\r\n\r\n" +
+       client->header = "HTTP/1.0 200 OK\r\n  Content-type: video/x-flv\r\nCache-Control: no-cache\r\nContent-type: todo/fixme\r\n\r\n" +
                streams[client->stream_id].header;
 
        // Switch states.