summaryrefslogtreecommitdiff
blob: e82a02116680a5146989d9658f279a6d9b0df1dc (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
From 2285e792f616f3be400f7eaab51d3a528afe8e68 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Thu, 20 May 2010 15:57:42 +0000
Subject: Add WebM support to Totem and browser plugin

---
diff --git a/browser-plugin/totemPlugin.cpp b/browser-plugin/totemPlugin.cpp
index 5382bb2..1c420f3 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 303bb23..a6eab04 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
--
cgit v0.8.3.1