From 1300d93c35dc4e9eb20fe589cdddc3a4c0b9c735 Mon Sep 17 00:00:00 2001
From: Jonatan Kronqvist <jonatan.kronqvist@itmill.com>
Date: Wed, 7 Sep 2011 11:49:09 +0000
Subject: HTML5 <audio> and <video> support #6909

svn changeset:20904/svn branch:6.7
---
 src/com/vaadin/service/FileTypeResolver.java | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/com/vaadin/service')

diff --git a/src/com/vaadin/service/FileTypeResolver.java b/src/com/vaadin/service/FileTypeResolver.java
index 7e3dda29a3..5025184ccd 100644
--- a/src/com/vaadin/service/FileTypeResolver.java
+++ b/src/com/vaadin/service/FileTypeResolver.java
@@ -134,6 +134,9 @@ public class FileTypeResolver implements Serializable {
             + "audio/x-pn-realaudio                            ra rm ram,"
             + "audio/x-scpls                                   pls,"
             + "audio/x-wav                                     wav,"
+            + "audio/ogg                                       ogg,"
+            + "audio/mp4                                       m4a,"
+            + "audio/x-aac                                     aac,"
             + "image/bitmap                                    bmp,"
             + "image/gif                                       gif,"
             + "image/ief                                       ief,"
@@ -190,6 +193,8 @@ public class FileTypeResolver implements Serializable {
             + "video/x-ms-asf                                  asf asx,"
             + "video/x-msvideo                                 avi,"
             + "video/x-sgi-movie                               movie,"
+            + "video/ogg                                       ogv,"
+            + "video/mp4                                       mp4,"
             + "x-world/x-vrml                                  vrm vrml wrl";
 
     /**
-- 
cgit v1.2.3