diff options
| author | Jonatan Kronqvist <jonatan.kronqvist@itmill.com> | 2011-09-07 11:49:09 +0000 |
|---|---|---|
| committer | Jonatan Kronqvist <jonatan.kronqvist@itmill.com> | 2011-09-07 11:49:09 +0000 |
| commit | 1300d93c35dc4e9eb20fe589cdddc3a4c0b9c735 (patch) | |
| tree | 1f76b5fb6d9291ebeed95520b6d61f7155c9a4aa /src/com/vaadin/service | |
| parent | f65e90d979d1ebacbef35d058b0bbf8e0349d0e3 (diff) | |
| download | vaadin-framework-1300d93c35dc4e9eb20fe589cdddc3a4c0b9c735.tar.gz vaadin-framework-1300d93c35dc4e9eb20fe589cdddc3a4c0b9c735.zip | |
HTML5 <audio> and <video> support #6909
svn changeset:20904/svn branch:6.7
Diffstat (limited to 'src/com/vaadin/service')
| -rw-r--r-- | src/com/vaadin/service/FileTypeResolver.java | 5 |
1 files changed, 5 insertions, 0 deletions
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"; /** |