Updating branch refs/heads/master
to acf1ad4b07faec700fd85982a05672404bd29c57 (commit)
from c7e2ce9a5e8825aee610b8bb78ae932369a9f2d9 (commit)
commit acf1ad4b07faec700fd85982a05672404bd29c57
Author: Sean Davis <smd.seanda...@gmail.com>
Date: Tue Jan 22 22:30:03 2013 -0500
Update mimetypes, add support for webm.
data/mime/mime-functions.sh | 5 ++---
data/mime/mime-type-list.txt | 28 ++++++++++++++++++++++++++++
2 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/data/mime/mime-functions.sh b/data/mime/mime-functions.sh
index 3ede00f..370f35b 100644
--- a/data/mime/mime-functions.sh
+++ b/data/mime/mime-functions.sh
@@ -2,14 +2,13 @@
get_audio_mimetypes ()
{
- MIMETYPES=`grep -v ^# $1 | grep "\/" | grep audio | grep -v
"audio/x-pn-realaudio"`
+ MIMETYPES=`grep -v '^#' $1 | grep "\/" | grep audio | grep -v
"audio/x-pn-realaudio" | grep -v "audio/x-scpls" | grep -v "audio/mpegurl" |
grep -v "audio/x-mpegurl" | grep -v x-scheme-handler/`
MIMETYPES="$MIMETYPES application/x-flac"
- MIMETYPES="$MIMETYPES application/vnd.rn-realmedia"
}
get_video_mimetypes ()
{
- MIMETYPES=`grep -v ^# $1 | grep -v x-content/ | grep -v audio | grep -v
"application/x-flac"`
+ MIMETYPES=`grep -v '^#' $1 | grep -v x-content/ | grep -v audio | grep
-v "application/x-flac" | grep -v "text/google-video-pointer" | grep -v
"application/x-quicktime-media-link" | grep -v "application/smil" | grep -v
"application/smil+xml" | grep -v "application/x-smil" | grep -v
"application/xspf+xml" | grep -v x-scheme-handler/`
MIMETYPES="$MIMETYPES audio/x-pn-realaudio"
}
diff --git a/data/mime/mime-type-list.txt b/data/mime/mime-type-list.txt
index 927f153..97f7b11 100644
--- a/data/mime/mime-type-list.txt
+++ b/data/mime/mime-type-list.txt
@@ -1,8 +1,11 @@
+application/mxf
application/ogg
application/ram
application/sdp
application/smil
application/smil+xml
+application/vnd.apple.mpegurl
+application/vnd.ms-wpl
application/vnd.rn-realmedia
application/x-extension-m4a
application/x-extension-mp4
@@ -15,24 +18,36 @@ application/x-quicktime-media-link
application/x-quicktimeplayer
application/x-shorten
application/x-smil
+application/xspf+xml
audio/3gpp
audio/ac3
audio/AMR
audio/AMR-WB
audio/basic
+audio/flac
audio/midi
+audio/mp2
audio/mp4
audio/mpeg
+audio/mpegurl
audio/ogg
+audio/prs.sid
audio/vnd.rn-realaudio
+audio/x-aiff
audio/x-ape
audio/x-flac
+audio/x-gsm
audio/x-it
audio/x-m4a
audio/x-matroska
audio/x-mod
audio/x-mp3
audio/x-mpeg
+audio/x-mpegurl
+audio/x-ms-asf
+audio/x-ms-asx
+audio/x-ms-wax
+audio/x-ms-wma
audio/x-musepack
audio/x-pn-aiff
audio/x-pn-au
@@ -42,8 +57,11 @@ audio/x-pn-wav
audio/x-pn-windows-acm
audio/x-realaudio
audio/x-real-audio
+audio/x-s3m
audio/x-sbc
+audio/x-scpls
audio/x-speex
+audio/x-stm
audio/x-tta
audio/x-wav
audio/x-wavpack
@@ -55,10 +73,13 @@ image/x-pict
misc/ultravox
text/google-video-pointer
text/x-google-video-pointer
+video/3gp
video/3gpp
video/dv
+video/divx
video/fli
video/flv
+video/mp2t
video/mp4
video/mp4v-es
video/mpeg
@@ -67,8 +88,10 @@ video/ogg
video/quicktime
video/vivo
video/vnd.divx
+video/vnd.mpegurl
video/vnd.rn-realvideo
video/vnd.vivo
+video/webm
video/x-anim
video/x-avi
video/x-flc
@@ -78,13 +101,18 @@ video/x-flv
video/x-m4v
video/x-matroska
video/x-mpeg
+video/x-mpeg2
video/x-ms-asf
+video/x-ms-asx
video/x-msvideo
video/x-ms-wm
video/x-ms-wmv
+video/x-ms-wmx
+video/x-ms-wvx
video/x-nsv
video/x-ogm+ogg
video/x-theora+ogg
+video/x-totem-stream
x-content/video-dvd
x-content/video-vcd
x-content/video-svcd
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
