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

[igor at sysoev.ru]

Author: is
Date: 2011-11-01 14:02:07 +0000 (Tue, 01 Nov 2011)
New Revision: 4252

Modified:
   branches/stable-1.0/
   branches/stable-1.0/conf/mime.types
   branches/stable-1.0/src/http/modules/ngx_http_mp4_module.c
Log:
Merging r4190, r4232:

MP4 related fixes:

*) Fixing mp4 module seeking on 32-bit platforms.

*) Adding m4a and m4v MIME types (ticket #42).



Property changes on: branches/stable-1.0
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:3960-3974,3977-3987,3991-3996,3998,4003-4007,4009-4013,4015-4018,4020,4023,4025-4027,4034-4065,4073,4077,4086-4090,4094-4102,4106-4108,4113-4114,4129-4137,4143,4147-4152,4154-4157,4177,4179,4182-4184,4186-4187,4191-4192,4199-4205,4207,4212,4219-4220,4229-4230,4235,4237
   + /trunk:3960-3974,3977-3987,3991-3996,3998,4003-4007,4009-4013,4015-4018,4020,4023,4025-4027,4034-4065,4073,4077,4086-4090,4094-4102,4106-4108,4113-4114,4129-4137,4143,4147-4152,4154-4157,4177,4179,4182-4184,4186-4187,4190-4192,4199-4205,4207,4212,4219-4220,4229-4230,4232,4235,4237

Modified: branches/stable-1.0/conf/mime.types
===================================================================
--- branches/stable-1.0/conf/mime.types	2011-11-01 14:00:04 UTC (rev 4251)
+++ branches/stable-1.0/conf/mime.types	2011-11-01 14:02:07 UTC (rev 4252)
@@ -62,6 +62,7 @@
     audio/midi                            mid midi kar;
     audio/mpeg                            mp3;
     audio/ogg                             ogg;
+    audio/x-m4a                           m4a;
     audio/x-realaudio                     ra;
 
     video/3gpp                            3gpp 3gp;
@@ -69,6 +70,7 @@
     video/mpeg                            mpeg mpg;
     video/quicktime                       mov;
     video/x-flv                           flv;
+    video/x-m4v                           m4v;
     video/x-mng                           mng;
     video/x-ms-asf                        asx asf;
     video/x-ms-wmv                        wmv;

Modified: branches/stable-1.0/src/http/modules/ngx_http_mp4_module.c
===================================================================
--- branches/stable-1.0/src/http/modules/ngx_http_mp4_module.c	2011-11-01 14:00:04 UTC (rev 4251)
+++ branches/stable-1.0/src/http/modules/ngx_http_mp4_module.c	2011-11-01 14:02:07 UTC (rev 4252)
@@ -1882,7 +1882,7 @@
     }
 
     entries = trak->time_to_sample_entries;
-    start_time = mp4->start * trak->timescale / 1000;
+    start_time = (uint64_t) mp4->start * trak->timescale / 1000;
 
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0,
                    "time-to-sample start_time:%uL", start_time);