7 files changed, 66 insertions, 13 deletions
diff --git a/gst/mxf/mxf.c b/gst/mxf/mxf.c
index 2015bb08..655faf3a 100644
--- a/gst/mxf/mxf.c
+++ b/gst/mxf/mxf.c
@@ -23,7 +23,6 @@
 #include <gst/gst.h>
 
 #include "mxfdemux.h"
-#include "mxfmetadata.h"
 #include "mxfaes-bwf.h"
 #include "mxfmpeg.h"
 #include "mxfdv-dif.h"
diff --git a/gst/mxf/mxfaes-bwf.h b/gst/mxf/mxfaes-bwf.h
index 6412504e..b9967456 100644
--- a/gst/mxf/mxfaes-bwf.h
+++ b/gst/mxf/mxfaes-bwf.h
@@ -27,7 +27,6 @@
 #include <gst/gst.h>
 
 #include "mxfparse.h"
-#include "mxfmetadata.h"
 
 void mxf_aes_bwf_init (void);
 
diff --git a/gst/mxf/mxfd10.c b/gst/mxf/mxfd10.c
index 4a63b50a..bbc02ecf 100644
--- a/gst/mxf/mxfd10.c
+++ b/gst/mxf/mxfd10.c
@@ -29,8 +29,6 @@
 #include <string.h>
 
 #include "mxfd10.h"
-#include "mxfmpeg.h"
-#include "mxfaes-bwf.h"
 
 GST_DEBUG_CATEGORY_EXTERN (mxf_debug);
 #define GST_CAT_DEFAULT mxf_debug
@@ -175,15 +173,15 @@ mxf_d10_create_caps (MXFMetadataTimelineTrack * track, GstTagList ** tags,
     if (!track->parent.descriptor[i])
       continue;
 
-    if (MXF_IS_METADATA_GENERIC_PICTURE_ESSENCE_DESCRIPTOR (track->parent.
-            descriptor[i])) {
-      p = (MXFMetadataGenericPictureEssenceDescriptor *) track->
-          parent.descriptor[i];
+    if (MXF_IS_METADATA_GENERIC_PICTURE_ESSENCE_DESCRIPTOR (track->
+            parent.descriptor[i])) {
+      p = (MXFMetadataGenericPictureEssenceDescriptor *) track->parent.
+          descriptor[i];
       break;
-    } else if (MXF_IS_METADATA_GENERIC_SOUND_ESSENCE_DESCRIPTOR (track->parent.
-            descriptor[i])) {
-      s = (MXFMetadataGenericSoundEssenceDescriptor *) track->
-          parent.descriptor[i];
+    } else if (MXF_IS_METADATA_GENERIC_SOUND_ESSENCE_DESCRIPTOR (track->
+            parent.descriptor[i])) {
+      s = (MXFMetadataGenericSoundEssenceDescriptor *) track->parent.
+          descriptor[i];
       break;
     }
   }
diff --git a/gst/mxf/mxfdms1.c b/gst/mxf/mxfdms1.c
new file mode 100644
index 00000000..89ef14a9
--- /dev/null
+++ b/gst/mxf/mxfdms1.c
@@ -0,0 +1,29 @@
+/* GStreamer
+ * Copyright (C) 2008 Sebastian Dröge <sebastian.droege@collabora.co.uk>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/* Implementation of SMPTE S380M - Descriptive Metadata Scheme-1 */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gst/gst.h>
+#include <string.h>
+
+#include "mxfdms1.h"
diff --git a/gst/mxf/mxfdms1.h b/gst/mxf/mxfdms1.h
new file mode 100644
index 00000000..d4f1fb0d
--- /dev/null
+++ b/gst/mxf/mxfdms1.h
@@ -0,0 +1,27 @@
+/* GStreamer
+ * Copyright (C) 2008 Sebastian Dröge <sebastian.droege@collabora.co.uk>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/* Implementation of SMPTE S380M - Descriptive Metadata Scheme-1 */
+
+#ifndef __MXF_DMS1_H__
+#define __MXF_DMS1_H__
+
+
+
+#endif /* __MXF_DMS1_H__ */
diff --git a/gst/mxf/mxfmpeg.h b/gst/mxf/mxfmpeg.h
index 07e7ddaa..4eaddd47 100644
--- a/gst/mxf/mxfmpeg.h
+++ b/gst/mxf/mxfmpeg.h
@@ -27,7 +27,6 @@
 #include <gst/gst.h>
 
 #include "mxfparse.h"
-#include "mxfmetadata.h"
 
 void mxf_mpeg_init (void);
 
diff --git a/gst/mxf/mxftypes.h b/gst/mxf/mxftypes.h
index d6f374d5..ca7e29f1 100644
--- a/gst/mxf/mxftypes.h
+++ b/gst/mxf/mxftypes.h
@@ -22,6 +22,8 @@
 #ifndef __MXF_TYPES_H__
 #define __MXF_TYPES_H__
 
+#include <gst/gst.h>
+
 /* SMPTE 377M 3.2 */
 typedef struct {
   guint8 u[16];