diff options
| author | Tim-Philipp Müller <tim@centricular.net> | 2006-06-12 10:53:26 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2006-06-12 10:53:26 +0000 |
| commit | 3e5431bbcbc21a2299083962cd1075dc76febb89 (patch) | |
| tree | 4faccd883423977c981e9e05738647d9940f3b7e | |
| parent | f2afddb8def68e9a4435c688887acff840a37c77 (diff) | |
| download | gst-plugins-bad-3e5431bbcbc21a2299083962cd1075dc76febb89.tar.gz gst-plugins-bad-3e5431bbcbc21a2299083962cd1075dc76febb89.tar.bz2 gst-plugins-bad-3e5431bbcbc21a2299083962cd1075dc76febb89.zip | |
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.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ext/libmms/gstmms.c | 2 | ||||
| -rw-r--r-- | sys/directdraw/gstdirectdrawsink.c | 6 |
3 files changed, 14 insertions, 2 deletions
@@ -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 bbb9ca8a..df5555c4 100644 --- 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 237ebb9b..58a04c1b 100644 --- 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 (); } |