Merge "Add MP4 to mime.types"

diff --git a/includes/mime.info b/includes/mime.info
index f7576e4..a4e8b64 100644 (file)
--- a/includes/mime.info
+++ b/includes/mime.info
@@ -30,6 +30,7 @@ application/x-dia-diagram [DRAWING]
 
 
 audio/mpeg audio/mp3 audio/mpeg3       [AUDIO]
+audio/mp4                              [AUDIO]
 audio/wav audio/x-wav audio/wave       [AUDIO]
 audio/midi audio/mid   [AUDIO]
 audio/basic            [AUDIO]
@@ -46,6 +47,7 @@ video/x-sgi-video             [VIDEO]
 video/x-flv                    [VIDEO]
 video/webm                     [VIDEO]
 video/x-matroska               [VIDEO]
+video/mp4                      [VIDEO]
 
 application/ogg application/x-ogg audio/ogg audio/x-ogg video/ogg video/x-ogg          [MULTIMEDIA]
 

diff --git a/includes/mime.types b/includes/mime.types
index a89d229..378f274 100644 (file)
--- a/includes/mime.types
+++ b/includes/mime.types
@@ -118,6 +118,8 @@ text/xml xml xsl xslt rss rdf
 text/x-setext etx
 text/x-sawfish jl
 video/mpeg mpeg mpg mpe
+video/mp4 mp4 m4a m4p m4b m4r m4v
+audio/mp4 m4a
 video/ogg ogv ogm ogg
 video/quicktime qt mov
 video/vnd.mpegurl mxu