ext/libmms/gstmms.c: Set caps on outgoing buffers.

Original commit message from CVS:
* ext/libmms/gstmms.c: (gst_mms_create):
Set caps on outgoing buffers.
* sys/directdraw/gstdirectdrawsink.c: (gst_directdrawsink_init):
Comment out unused global instance variable.

diff --git a/ChangeLog b/ChangeLog
index 2dbcc6f..a18d7a8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-06-12  Tim-Philipp Müller  <tim at centricular dot net>
+
+       * ext/libmms/gstmms.c: (gst_mms_create):
+         Set caps on outgoing buffers.
+
+       * sys/directdraw/gstdirectdrawsink.c: (gst_directdrawsink_init):
+         Comment out unused global instance variable.
+
 2006-06-10  Tim-Philipp Müller  <tim at centricular dot net>
 
        Patch by: Sebastian Dröge  <mail at slomosnail de>

diff --git a/ext/libmms/gstmms.c b/ext/libmms/gstmms.c
index bbb9ca8..df5555c 100644 (file)
--- a/ext/libmms/gstmms.c
+++ b/ext/libmms/gstmms.c
@@ -262,6 +262,8 @@ gst_mms_create (GstPushSrc * psrc, GstBuffer ** buf)
   GST_DEBUG ("Returning buffer with offset %" G_GINT64_FORMAT " and size %u",
       GST_BUFFER_OFFSET (*buf), GST_BUFFER_SIZE (*buf));
 
+  gst_buffer_set_caps (*buf, GST_PAD_CAPS (GST_BASE_SRC_PAD (mmssrc)));
+
   return GST_FLOW_OK;
 
 eos:

diff --git a/sys/directdraw/gstdirectdrawsink.c b/sys/directdraw/gstdirectdrawsink.c
index 237ebb9..58a04c1 100644 (file)
--- a/sys/directdraw/gstdirectdrawsink.c
+++ b/sys/directdraw/gstdirectdrawsink.c
@@ -334,7 +334,9 @@ gst_ddrawsurface_get_type (void)
   return _gst_ddrawsurface_type;
 }
 
-static GstDirectDrawSink *global_ddrawsink = NULL;
+/* FIXME: this is problematic if there is more than one sink instance at the
+ * same time, surely there exists a better solution than this? */
+/* static GstDirectDrawSink *global_ddrawsink = NULL; */
 
 /*GType
 gst_directdrawsink_get_type (void)
@@ -513,7 +515,7 @@ gst_directdrawsink_init (GstDirectDrawSink * ddrawsink,
   ddrawsink->buffer_pool = NULL;
 
   ddrawsink->resize_window = TRUE;      /*resize only our internal window to the video size */
-  global_ddrawsink = ddrawsink;
+  /* global_ddrawsink = ddrawsink; */
 
   ddrawsink->pool_lock = g_mutex_new ();
 }