diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2011-11-01 14:02:07 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2011-11-01 14:02:07 +0000 |
| commit | 8f25bfda215858a3b1a93840656ead82c2aa57ec (patch) | |
| tree | 5225bb94695abb2b26aae7c8a428982887a980a3 /src | |
| parent | 74d7c5319cbe44ccd10893f0c94468b082e2a25d (diff) | |
| download | nginx-8f25bfda215858a3b1a93840656ead82c2aa57ec.tar.gz nginx-8f25bfda215858a3b1a93840656ead82c2aa57ec.tar.bz2 | |
Merging r4190, r4232:
MP4 related fixes:
*) Fixing mp4 module seeking on 32-bit platforms.
*) Adding m4a and m4v MIME types (ticket #42).
Diffstat (limited to 'src')
| -rw-r--r-- | src/http/modules/ngx_http_mp4_module.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/http/modules/ngx_http_mp4_module.c b/src/http/modules/ngx_http_mp4_module.c index 1140d9174..a6752123a 100644 --- a/src/http/modules/ngx_http_mp4_module.c +++ b/src/http/modules/ngx_http_mp4_module.c @@ -1882,7 +1882,7 @@ ngx_http_mp4_update_stts_atom(ngx_http_mp4_file_t *mp4, } 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); |