Author: nick
Date: Thu Aug 28 05:52:13 2014
New Revision: 1621049

URL: http://svn.apache.org/r1621049
Log:
TIKA-1259 Add the Ogg Daala video mimetype, and remove an incorrect vorbis 
magic (it was actually a general Ogg one, which is already on the parent)

Modified:
    
tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml

Modified: 
tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml?rev=1621049&r1=1621048&r2=1621049&view=diff
==============================================================================
--- 
tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml 
(original)
+++ 
tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml 
Thu Aug 28 05:52:13 2014
@@ -3771,8 +3771,6 @@
       <match value="OggS\000.......................\001vorbis" type="string"
              
mask="0xFFFFFFFF00000000000000000000000000000000000000000000000000FFFFFFFFFFFF"
              offset="0"/>
-      <match value="\x4f\x67\x67\x53\x00\x02\x00\x00\x00\x00\x00\x00\x00\x00"
-             type="string" offset="0"/>
     </magic>
     <glob pattern="*.ogg"/>
     <sub-class-of type="audio/ogg"/>
@@ -5626,6 +5624,18 @@
     <sub-class-of type="application/ogg"/>
   </mime-type>
 
+  <mime-type type="video/daala">
+    <_comment>Ogg Daala Video</_comment>
+    <alias type="video/x-daala"/>
+    <magic priority="60">
+      <!-- Assumes Video stream comes before Audio, may not always -->
+      <match value="OggS\000.......................\x80daala" type="string"
+             
mask="0xFFFFFFFF00000000000000000000000000000000000000000000000000FFFFFFFFFFFF"
+             offset="0"/>
+    </magic>
+    <sub-class-of type="video/ogg"/>
+  </mime-type>
+
   <mime-type type="video/theora">
     <_comment>Ogg Theora Video</_comment>
     <alias type="video/x-theora"/>


Reply via email to