Mercurial > hg > nginx

diff conf/mime.types @ 4169:432243531ce3 stable-1.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merging r4086, r4087, r4088, r4090, r4094, r4095, r4096, r4097, r4099, r4100, r4106, r4107, r4108, r4113, r4156, r4157: *) ngx_http_mp4_module. *) "video/mp4" mime type added.
author Igor Sysoev <igor@sysoev.ru>
date Fri, 30 Sep 2011 15:13:47 +0000
parents cff87803b898
children d50883ff2433
line wrap: on
line diff
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -65,6 +65,7 @@ types {
     audio/x-realaudio                     ra;
 
     video/3gpp                            3gpp 3gp;
+    video/mp4                             mp4;
     video/mpeg                            mpeg mpg;
     video/quicktime                       mov;
     video/x-flv                           flv;