compile fixes

Original commit message from CVS:
compile fixes

diff --git a/gst-libs/gst/media-info/media-info-priv.h b/gst-libs/gst/media-info/media-info-priv.h
index 239cbb4..4353b69 100644 (file)
--- a/gst-libs/gst/media-info/media-info-priv.h
+++ b/gst-libs/gst/media-info/media-info-priv.h
@@ -103,7 +103,11 @@ void               gmi_stream_free                 (GstMediaInfoStream *stream);
 GstMediaInfoTrack *
                gmi_track_new                   (void);
 
-void           gmi_reset                       (GstMediaInfo *info);
+void           gmip_reset                      (GstMediaInfoPriv *priv);
+void           gmip_init                       (GstMediaInfoPriv *priv, GError **error);
+
+void           gmi_clear_decoder               (GstMediaInfo *info);
+
 gboolean       gmi_seek_to_track               (GstMediaInfo *info,
                                                 long track);
 

diff --git a/gst-libs/gst/media-info/media-info.c b/gst-libs/gst/media-info/media-info.c
index 6b25fcb..e603031 100644 (file)
--- a/gst-libs/gst/media-info/media-info.c
+++ b/gst-libs/gst/media-info/media-info.c
@@ -25,7 +25,6 @@
 #include <string.h>
 #include "media-info.h"
 #include "media-info-priv.h"
-#include "media-info-marshal.h"
 
 static void    gst_media_info_class_init       (GstMediaInfoClass *klass);
 static void    gst_media_info_instance_init    (GstMediaInfo *info);
@@ -147,7 +146,7 @@ gst_media_info_class_init (GstMediaInfoClass *klass)
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GstMediaInfoClass, media_info_signal),
                  NULL, NULL,
-                 gst_media_info_marshal_VOID__VOID,
+                 gst_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);
 }
 
@@ -161,7 +160,7 @@ gst_media_info_instance_init (GstMediaInfo *info)
 
   if (!_media_info_inited) { gst_media_info_init (); }
 
-  gmip_init (info->priv);
+  gmip_init (info->priv, error);
   gmip_reset (info->priv);
 }