Repository: tika Updated Branches: refs/heads/master 1b7009d0b -> bee1a87d7
Better express the MP4/QuickTime relationship in our mime type hierarchy Project: http://git-wip-us.apache.org/repos/asf/tika/repo Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/bee1a87d Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/bee1a87d Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/bee1a87d Branch: refs/heads/master Commit: bee1a87d7d9ad3a1c5f45cf65082b9505dbe9fc0 Parents: 1b7009d Author: Nick Burch <[email protected]> Authored: Sun Mar 6 13:02:24 2016 +0000 Committer: Nick Burch <[email protected]> Committed: Sun Mar 6 13:02:24 2016 +0000 ---------------------------------------------------------------------- .../resources/org/apache/tika/mime/tika-mimetypes.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tika/blob/bee1a87d/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml ---------------------------------------------------------------------- diff --git a/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml b/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml index 4c3e770..bcf4fee 100644 --- a/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml +++ b/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml @@ -362,9 +362,20 @@ <mime-type type="application/moss-signature"/> <mime-type type="application/mosskey-data"/> <mime-type type="application/mosskey-request"/> + + <mime-type type="application/quicktime"> + <!-- The is the base QuickTime container --> + <!-- QuickTime video, and all MP4 formats, are based on it --> + <acronym>QTFF</acronym> + <_comment>QuickTime container format</_comment> + </mime-type> <mime-type type="application/mp4"> + <!-- Arbitrary data stored in a MP4 container --> + <_comment>MP4 container format</_comment> <glob pattern="*.mp4s"/> + <sub-class-of type="application/quicktime" /> </mime-type> + <mime-type type="application/mpeg4-generic"/> <mime-type type="application/mpeg4-iod"/> <mime-type type="application/mpeg4-iod-xmt"/> @@ -4238,6 +4249,7 @@ <glob pattern="*.mp4a"/> <glob pattern="*.m4a"/> <glob pattern="*.m4b"/> + <sub-class-of type="application/quicktime" /> </mime-type> <mime-type type="audio/mp4a-latm"/> <mime-type type="audio/mpa"/> @@ -6370,6 +6382,7 @@ <mime-type type="video/pointer"/> <mime-type type="video/quicktime"> + <_comment>QuickTime Video</_comment> <magic priority="50"> <match value="moov" type="string" offset="4"/> <match value="mdat" type="string" offset="4"/> @@ -6378,6 +6391,7 @@ </magic> <glob pattern="*.qt"/> <glob pattern="*.mov"/> + <sub-class-of type="application/quicktime" /> </mime-type> <mime-type type="video/raw"/>
