Merge branch '7.x' into 7.x-ISLANDORA-1362

Islandora · Dec 10, 2015 · 29ad602 · 29ad602
2 parents 243ee6a + e2c1b8b
commit 29ad602
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/xml/islandora_video_ds_composite_model.xml b/xml/islandora_video_ds_composite_model.xml
@@ -12,6 +12,15 @@
   <dsTypeModel ID="MODS" optional="true">
     <form FORMAT_URI="http://www.loc.gov/mods/v3" MIME="application/xml"/>
   </dsTypeModel>
+  <dsTypeModel ID="OBJ" optional="true">
+    <form MIME="video/mp4"/>
+    <form MIME="video/quicktime"/>
+    <form MIME="video/m4v"/>
+    <form MIME="video/x-matroska"/>
+    <form MIME="video/ogg"/>
+    <form MIME="video/x-msvideo"/>
+    <form MIME="video/avi"/>
+  </dsTypeModel>
   <dsTypeModel ID="TECHMD">
     <form MIME="application/xml"/>
   </dsTypeModel>
@@ -32,13 +41,4 @@
   <dsTypeModel ID="MP4" optional="false">
     <form MIME="video/mp4"/>
   </dsTypeModel>
-  <dsTypeModel ID="OBJ" optional="true">
-    <form MIME="video/mp4"/>
-    <form MIME="video/quicktime"/>
-    <form MIME="video/m4v"/>
-    <form MIME="video/x-matroska"/>
-    <form MIME="video/ogg"/>
-    <form MIME="video/x-msvideo"/>
-    <form MIME="video/avi"/>
-  </dsTypeModel>
 </dsCompositeModel>