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 /conf | |
| 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 'conf')
| -rw-r--r-- | conf/mime.types | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/conf/mime.types b/conf/mime.types index c4ab45ec9..24e866e8f 100644 --- a/conf/mime.types +++ b/conf/mime.types @@ -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; |