Permalink
Browse files

Merge pull request #12 from vidibus/master

Added mime types
  • Loading branch information...
2 parents ef69f2a + 21fb3b0 commit 098e9460b48772b33826c828384e60ada87c3152 @halostatue committed Mar 31, 2012
@@ -116,7 +116,7 @@ application/mpeg4-iod-xmt 'IANA,RFC4337
application/msc-ivr+xml 'IANA,RFC6231
application/msc-mixer+xml 'IANA,{RFC-ietf-mediactrl-mixer-control-package-14=http://tools.ietf.org/html/draft-ietf-mediactrl-mixer-control-package}
application/msword @doc,dot,wrd :base64 'IANA,[Lindner]
-application/mxf 'IANA,RFC4539
+application/mxf @mxf 'IANA,RFC4539
application/nasdata 'IANA,RFC4707
application/news-checkgroups 'IANA,RFC5537
application/news-groupinfo 'IANA,RFC5537
@@ -15,6 +15,7 @@
*application/set 'LTSW
*application/solids 'LTSW
*application/vda 'LTSW
+*application/vnd.rn-realmedia @rm
*application/vnd.stardivision.calc @sdc
*application/vnd.stardivision.chart @sds
*application/vnd.stardivision.draw @sda
@@ -1,7 +1,7 @@
audio/x-aiff @aif,aifc,aiff :base64
audio/x-aac @aac
audio/x-midi @mid,midi,kar :base64
-audio/x-pn-realaudio @rm,ram :base64
+audio/x-pn-realaudio @ra,ram :base64
audio/x-pn-realaudio-plugin @rpm
audio/x-realaudio @ra :base64
audio/x-wav @wav :base64
View
@@ -1,7 +1,7 @@
video/1d-interleaved-parityfec 'IANA,RFC6015
video/3gpp @3gp,3gpp 'IANA,RFC3839,RFC6381
video/3gpp-tt 'IANA,RFC4396
-video/3gpp2 'IANA,RFC4393,RFC6381
+video/3gpp2 @3g2,3gpp2 'IANA,RFC4393,RFC6381
video/BMPEG 'IANA,RFC3555
video/BT656 'IANA,RFC3555
video/CelB 'IANA,RFC3555
@@ -19,14 +19,14 @@ video/jpeg2000 'IANA,RFC5371,RFC5372
video/MJ2 @mj2,mjp2 'IANA,RFC3745
video/MP1S 'IANA,RFC3555
video/MP2P 'IANA,RFC3555
-video/MP2T 'IANA,RFC3555
+video/MP2T @ts 'IANA,RFC3555
video/mp4 @mp4,mpg4,f4v,f4p 'IANA,RFC4337,RFC6381,{Adobe=http://www.kaourantin.net/2007/10/new-file-extensions-and-mime-types.html}
video/MP4V-ES 'IANA,RFC6416
-video/mpeg @mp2,mpe,mp3g,mpg :base64 'IANA,RFC2045,RFC2046
+video/mpeg @mp2,mp3g,mpe,mpeg,mpg :base64 'IANA,RFC2045,RFC2046
video/mpeg4-generic 'IANA,RFC3640
video/MPV 'IANA,RFC3555
video/nv 'IANA,RFC4856
-video/ogg @ogv 'IANA,RFC5334
+video/ogg @ogg,ogv 'IANA,RFC5334
video/parityfec 'IANA,RFC5109
video/pointer 'IANA,RFC2862
video/quicktime @qt,mov :base64 'IANA,[Lindner]
@@ -1,11 +1,16 @@
video/x-dl @dl :base64
+video/x-dv @dv
video/x-fli @fli :base64
video/x-flv @flv :base64
video/x-gl @gl :base64
+video/x-ivf @ivf
+video/x-matroska @mkv
+video/x-motion-jpeg @mjpg
video/x-ms-asf @asf,asx
video/x-ms-wm @wm
video/x-ms-wmv @wmv
video/x-ms-wmx @wmx
video/x-ms-wvx @wvx
video/x-msvideo @avi :base64
video/x-sgi-movie @movie :base64
+

0 comments on commit 098e946

Please sign in to comment.