commit bdbe6939ff336d97f707c7d85be2eca114d3f6a0
author Mike Lockwood <lockwood@android.com> Wed Aug 10 10:28:25 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 10 10:28:25 2011 -0700
tree 89c915f620af84dd9fbe0c6b793c7fc580e1ac4b
parent b33e079aca275e2e08fa8e9840f2a9df72eb1933
parent ff535914825f63999648030a02f57767593462f0

Merge "Use video/webm mime type for WEBM files"

media/java/android/media/MediaFile.java

diff --git a/media/java/android/media/MediaFile.java b/media/java/android/media/MediaFile.java
index 816d215..8793841 100644
--- a/media/java/android/media/MediaFile.java
+++ b/media/java/android/media/MediaFile.java
@@ -67,8 +67,9 @@
     public static final int FILE_TYPE_MKV     = 27;
     public static final int FILE_TYPE_MP2TS   = 28;
     public static final int FILE_TYPE_AVI     = 29;
+    public static final int FILE_TYPE_WEBM    = 30;
     private static final int FIRST_VIDEO_FILE_TYPE = FILE_TYPE_MP4;
-    private static final int LAST_VIDEO_FILE_TYPE = FILE_TYPE_AVI;
+    private static final int LAST_VIDEO_FILE_TYPE = FILE_TYPE_WEBM;
     
     // Image file types
     public static final int FILE_TYPE_JPEG    = 31;
@@ -198,7 +199,7 @@
         addFileType("3G2", FILE_TYPE_3GPP2, "video/3gpp2", MtpConstants.FORMAT_3GP_CONTAINER);
         addFileType("3GPP2", FILE_TYPE_3GPP2, "video/3gpp2", MtpConstants.FORMAT_3GP_CONTAINER);
         addFileType("MKV", FILE_TYPE_MKV, "video/x-matroska");
-        addFileType("WEBM", FILE_TYPE_MKV, "video/x-matroska");
+        addFileType("WEBM", FILE_TYPE_WEBM, "video/webm");
         addFileType("TS", FILE_TYPE_MP2TS, "video/mp2ts");
         addFileType("AVI", FILE_TYPE_AVI, "video/avi");