summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2010-05-20 16:57:42 +0100
committerBastien Nocera <hadess@hadess.net>2010-05-20 16:57:42 +0100
commit87207e8f91ca9ec1b9bcb02c8dd6542acb483841 (patch)
tree1d31bda52b7f034f57537fa68cd9c269f183a469
parentc5d86dfbc74024a25528b705efa65af8c78101be (diff)
Add WebM support to Totem and browser plugin
-rw-r--r--browser-plugin/totemPlugin.cpp1
-rw-r--r--data/mime-type-list.txt1
2 files changed, 2 insertions, 0 deletions
diff --git a/browser-plugin/totemPlugin.cpp b/browser-plugin/totemPlugin.cpp
index d7ec6105..9bacbf90 100644
--- a/browser-plugin/totemPlugin.cpp
+++ b/browser-plugin/totemPlugin.cpp
@@ -126,6 +126,7 @@ static const totemPluginMimeEntry kMimeTypes[] = {
{ "audio/mpeg", "mp3", NULL },
{ "application/x-nsv-vp3-mp3", "nsv", "video/x-nsv" },
{ "video/flv", "flv", "application/x-flash-video" },
+ { "video/webm", "webm", NULL },
{ "application/x-totem-plugin", "", "Totem Multimedia plugin" },
{ "audio/midi", "mid, midi", NULL },
#else
diff --git a/data/mime-type-list.txt b/data/mime-type-list.txt
index 303bb232..a6eab042 100644
--- a/data/mime-type-list.txt
+++ b/data/mime-type-list.txt
@@ -82,6 +82,7 @@ video/vivo
video/vnd.divx
video/vnd.rn-realvideo
video/vnd.vivo
+video/webm
video/x-anim
video/x-avi
video/x-flc