Mercurial > hg > nginx-quic
comparison conf/mime.types @ 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 | 432243531ce3 |
children | 3a3a2d767ecd a1bb976ec16a |
comparison
equal
deleted
inserted
replaced
4250:ac0a3dc948c3 | 4251:cc7ea429170d |
---|---|
60 application/octet-stream msi msp msm; | 60 application/octet-stream msi msp msm; |
61 | 61 |
62 audio/midi mid midi kar; | 62 audio/midi mid midi kar; |
63 audio/mpeg mp3; | 63 audio/mpeg mp3; |
64 audio/ogg ogg; | 64 audio/ogg ogg; |
65 audio/x-m4a m4a; | |
65 audio/x-realaudio ra; | 66 audio/x-realaudio ra; |
66 | 67 |
67 video/3gpp 3gpp 3gp; | 68 video/3gpp 3gpp 3gp; |
68 video/mp4 mp4; | 69 video/mp4 mp4; |
69 video/mpeg mpeg mpg; | 70 video/mpeg mpeg mpg; |
70 video/quicktime mov; | 71 video/quicktime mov; |
71 video/x-flv flv; | 72 video/x-flv flv; |
73 video/x-m4v m4v; | |
72 video/x-mng mng; | 74 video/x-mng mng; |
73 video/x-ms-asf asx asf; | 75 video/x-ms-asf asx asf; |
74 video/x-ms-wmv wmv; | 76 video/x-ms-wmv wmv; |
75 video/x-msvideo avi; | 77 video/x-msvideo avi; |
76 } | 78 } |