Mercurial > hg > nginx
changeset 4251:cc7ea429170d stable-1.0
Merging r4190, r4232:
MP4 related fixes:
*) Fixing mp4 module seeking on 32-bit platforms.
*) Adding m4a and m4v MIME types (ticket #42).
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Tue, 01 Nov 2011 14:02:07 +0000 |
parents | ac0a3dc948c3 |
children | 94049ec3eeda |
files | conf/mime.types src/http/modules/ngx_http_mp4_module.c |
diffstat | 2 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/conf/mime.types Tue Nov 01 14:00:04 2011 +0000 +++ b/conf/mime.types Tue Nov 01 14:02:07 2011 +0000 @@ -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;
--- a/src/http/modules/ngx_http_mp4_module.c Tue Nov 01 14:00:04 2011 +0000 +++ b/src/http/modules/ngx_http_mp4_module.c Tue Nov 01 14:02:07 2011 +0000 @@ -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);