From 419583c9b5ba44f07ba16031f622d9540418ddda Mon Sep 17 00:00:00 2001
From: Jan Schmidt <thaytan@mad.scientist.com>
Date: Wed, 22 Sep 2004 15:03:08 +0000
Subject: 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.
---
 sys/oss/gstosssink.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sys')

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;
-- 
cgit