summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2011-12-14 15:30:02 +0000
committerMaxim Dounin <mdounin@mdounin.ru>2011-12-14 15:30:02 +0000
commit47463035c886b0b3af3cc56cb0c9855abe6340d6 (patch)
tree9461ecb5ed9d5305144c435956b5b97e1598fe7e
parent430aef49ace08d55d59a2cf600af25bdfe6b0482 (diff)
downloadnginx-47463035c886b0b3af3cc56cb0c9855abe6340d6.tar.gz
nginx-47463035c886b0b3af3cc56cb0c9855abe6340d6.tar.bz2
Merge of r4298:
Fixed flv header to match specification. Used "\x5" in 5th byte to claim presence of both audio and video. Used previous tag size 0 in the beginning of the flv body (bytes 10 .. 13) as required by specification (see http://www.adobe.com/devnet/f4v.html). Patch by Piotr Sikora.
-rw-r--r--src/http/modules/ngx_http_flv_module.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/http/modules/ngx_http_flv_module.c b/src/http/modules/ngx_http_flv_module.c
index 270d969db..30af834ab 100644
--- a/src/http/modules/ngx_http_flv_module.c
+++ b/src/http/modules/ngx_http_flv_module.c
@@ -23,7 +23,7 @@ static ngx_command_t ngx_http_flv_commands[] = {
};
-static u_char ngx_flv_header[] = "FLV\x1\x1\0\0\0\x9\0\0\0\x9";
+static u_char ngx_flv_header[] = "FLV\x1\x5\0\0\0\x9\0\0\0\0";
static ngx_http_module_t ngx_http_flv_module_ctx = {