Index: tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
===================================================================
--- tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml	(revision 1210883)
+++ tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml	(working copy)
@@ -3023,6 +3023,14 @@
     <glob pattern="*.m3a"/>
   </mime-type>
 
+  <mime-type type="audio/x-m4a">
+    <magic priority="60">
+      <match value="M4A " type="string" offset="8"/>
+    </magic>
+    <glob pattern="*.m4a"/>
+    <sub-class-of type="video/quicktime"/>
+  </mime-type>
+
   <mime-type type="audio/mpeg4-generic"/>
 
   <mime-type type="audio/ogg">
@@ -4253,7 +4261,11 @@
   </mime-type>
 
   <mime-type type="video/x-m4v">
+    <magic priority="60">
+      <match value="M4V " type="string" offset="8"/>
+    </magic>
     <glob pattern="*.m4v"/>
+    <sub-class-of type="video/quicktime"/>
   </mime-type>
 
   <mime-type type="video/x-mng">