diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | ext/gdk_pixbuf/pixbufscale.c | 10 | ||||
| -rw-r--r-- | sys/oss/gstosssink.c | 2 |
3 files changed, 24 insertions, 1 deletions
@@ -1,3 +1,16 @@ +2004-09-23 Jan Schmidt <thaytan@mad.scientist.com> + + * 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. + 2004-09-22 Zaheer Abbas Merali <zaheerabbas at merali dot org> * ext/ogg/gstoggmux.c: (gst_ogg_mux_init), diff --git a/ext/gdk_pixbuf/pixbufscale.c b/ext/gdk_pixbuf/pixbufscale.c index 8dca4d37..45b9c7a9 100644 --- a/ext/gdk_pixbuf/pixbufscale.c +++ b/ext/gdk_pixbuf/pixbufscale.c @@ -164,6 +164,7 @@ gst_pixbufscale_getcaps (GstPad * pad) GstCaps *othercaps; GstCaps *caps; GstPad *otherpad; + int i; pixbufscale = GST_PIXBUFSCALE (gst_pad_get_parent (pad)); @@ -174,6 +175,15 @@ gst_pixbufscale_getcaps (GstPad * pad) caps = gst_caps_intersect (othercaps, gst_pad_get_pad_template_caps (pad)); gst_caps_free (othercaps); + for (i = 0; i < gst_caps_get_size (caps); i++) { + GstStructure *structure = gst_caps_get_structure (caps, i); + + gst_structure_set (structure, + "width", GST_TYPE_INT_RANGE, 16, 4096, + "height", GST_TYPE_INT_RANGE, 16, 4096, NULL); + gst_structure_remove_field (structure, "pixel-aspect-ratio"); + } + GST_DEBUG ("getcaps are: %" GST_PTR_FORMAT, caps); return caps; } 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; |