Mercurial > hg > nginx
comparison src/http/modules/ngx_http_mp4_module.c @ 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 | aaa936b2cab5 |
children | d0dcaff8862b |
comparison
equal
deleted
inserted
replaced
4250:ac0a3dc948c3 | 4251:cc7ea429170d |
---|---|
1880 mp4->file.name.data); | 1880 mp4->file.name.data); |
1881 return NGX_ERROR; | 1881 return NGX_ERROR; |
1882 } | 1882 } |
1883 | 1883 |
1884 entries = trak->time_to_sample_entries; | 1884 entries = trak->time_to_sample_entries; |
1885 start_time = mp4->start * trak->timescale / 1000; | 1885 start_time = (uint64_t) mp4->start * trak->timescale / 1000; |
1886 | 1886 |
1887 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, | 1887 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, mp4->file.log, 0, |
1888 "time-to-sample start_time:%uL", start_time); | 1888 "time-to-sample start_time:%uL", start_time); |
1889 | 1889 |
1890 start_sample = 0; | 1890 start_sample = 0; |