mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-09-08 13:18:52 +00:00
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.
This commit is contained in:
parent
842261be41
commit
419583c9b5
3 changed files with 24 additions and 1 deletions
13
ChangeLog
13
ChangeLog
|
@ -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>
|
2004-09-22 Zaheer Abbas Merali <zaheerabbas at merali dot org>
|
||||||
|
|
||||||
* ext/ogg/gstoggmux.c: (gst_ogg_mux_init),
|
* ext/ogg/gstoggmux.c: (gst_ogg_mux_init),
|
||||||
|
|
|
@ -164,6 +164,7 @@ gst_pixbufscale_getcaps (GstPad * pad)
|
||||||
GstCaps *othercaps;
|
GstCaps *othercaps;
|
||||||
GstCaps *caps;
|
GstCaps *caps;
|
||||||
GstPad *otherpad;
|
GstPad *otherpad;
|
||||||
|
int i;
|
||||||
|
|
||||||
pixbufscale = GST_PIXBUFSCALE (gst_pad_get_parent (pad));
|
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));
|
caps = gst_caps_intersect (othercaps, gst_pad_get_pad_template_caps (pad));
|
||||||
gst_caps_free (othercaps);
|
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);
|
GST_DEBUG ("getcaps are: %" GST_PTR_FORMAT, caps);
|
||||||
return caps;
|
return caps;
|
||||||
}
|
}
|
||||||
|
|
|
@ -339,7 +339,7 @@ gst_osssink_get_time (GstClock * clock, gpointer data)
|
||||||
{
|
{
|
||||||
GstOssSink *osssink = GST_OSSSINK (data);
|
GstOssSink *osssink = GST_OSSSINK (data);
|
||||||
gint delay;
|
gint delay;
|
||||||
GstClockTimeDiff res;
|
GstClockTime res;
|
||||||
|
|
||||||
if (!GST_OSSELEMENT (osssink)->bps)
|
if (!GST_OSSELEMENT (osssink)->bps)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in a new issue