Fijxu/nginx-quic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merging r4190, r4232:

Browse source 
MP4 related fixes:

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

*) Adding m4a and m4v MIME types (ticket #42).
This commit is contained in:
Igor Sysoev 2011-11-01 14:02:07 +00:00
parent 60fc9be85d
commit 816c6c8049
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
conf/mime.types
View file

@ -62,6 +62,7 @@ types {
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 @@ types {
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;

2
src/http/modules/ngx_http_mp4_module.c
View file

@ -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);