diff options
| author | Jan Schmidt <thaytan@mad.scientist.com> | 2004-09-22 15:03:08 +0000 |
|---|---|---|
| committer | Jan Schmidt <thaytan@mad.scientist.com> | 2004-09-22 15:03:08 +0000 |
| commit | 419583c9b5ba44f07ba16031f622d9540418ddda (patch) | |
| tree | d0eb582b424586f62407e92e4e88145b7d6e1225 /sys/oss/gstosssink.c | |
| parent | 842261be410a443a276941ef35c3a503f8808b46 (diff) | |
ext/gdk_pixbuf/pixbufscale.c: Correct caps negotiation
Original commit message from CVS:
* ext/gdk_pixbuf/pixbufscale.c: (gst_pixbufscale_getcaps):
Correct caps negotiation
* gst/volume/gstvolume.c: (volume_chain_float),
(volume_chain_int16):
Modify debug output to be little more informative
* sys/ximage/ximagesink.c: (gst_ximagesink_check_xshm_calls):
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_check_xshm_calls),
(gst_xvimagesink_xvimage_destroy):
Add XSync calls after detaching from the shared memory segment to
avoid a crash.
Diffstat (limited to 'sys/oss/gstosssink.c')
| -rw-r--r-- | sys/oss/gstosssink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/oss/gstosssink.c b/sys/oss/gstosssink.c index a7786c37..d2935760 100644 --- a/sys/oss/gstosssink.c +++ b/sys/oss/gstosssink.c @@ -339,7 +339,7 @@ gst_osssink_get_time (GstClock * clock, gpointer data) { GstOssSink *osssink = GST_OSSSINK (data); gint delay; - GstClockTimeDiff res; + GstClockTime res; if (!GST_OSSELEMENT (osssink)->bps) return 0; |