[nginx] svn commit: r4364 - in branches/stable-1.0: . src/http/modules

[mdounin at mdounin.ru]

Author: mdounin
Date: 2011-12-14 15:30:02 +0000 (Wed, 14 Dec 2011)
New Revision: 4364

Log:
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.


Modified:
   branches/stable-1.0/
   branches/stable-1.0/src/http/modules/ngx_http_flv_module.c


Property changes on: branches/stable-1.0
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:3960-3974,3977-3987,3991-3996,3998,4000-4018,4020,4023,4025-4027,4034-4065,4073,4077,4086-4090,4094-4102,4106-4108,4113-4114,4129-4137,4143-4144,4147-4158,4177,4179,4182-4184,4186-4187,4189-4205,4207,4209-4210,4212,4217-4223,4227-4232,4235-4237,4265-4268,4270,4274-4276,4278-4280,4282-4284,4294-4295,4300-4304,4308-4309,4321,4342-4343
   + /trunk:3960-3974,3977-3987,3991-3996,3998,4000-4018,4020,4023,4025-4027,4034-4065,4073,4077,4086-4090,4094-4102,4106-4108,4113-4114,4129-4137,4143-4144,4147-4158,4177,4179,4182-4184,4186-4187,4189-4205,4207,4209-4210,4212,4217-4223,4227-4232,4235-4237,4265-4268,4270,4274-4276,4278-4280,4282-4284,4294-4295,4298,4300-4304,4308-4309,4321,4342-4343

Modified: branches/stable-1.0/src/http/modules/ngx_http_flv_module.c
===================================================================
--- branches/stable-1.0/src/http/modules/ngx_http_flv_module.c	2011-12-14 15:28:13 UTC (rev 4363)
+++ branches/stable-1.0/src/http/modules/ngx_http_flv_module.c	2011-12-14 15:30:02 UTC (rev 4364)
@@ -23,7 +23,7 @@
 };
 
 
-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 = {