mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-11 18:05:37 +00:00
ext/pango/gsttextoverlay.c: Don't unnecessarily ref (and then leak) upstream events if the text pad is not linked. Fi...
Original commit message from CVS: * ext/pango/gsttextoverlay.c: (gst_text_overlay_src_event), (gst_text_overlay_text_event): Don't unnecessarily ref (and then leak) upstream events if the text pad is not linked. Fixes #399948. * tests/check/gst-plugins-base.supp: Add suppression for pango on edgy/x86 for textoverlay test.
This commit is contained in:
parent
81e92118da
commit
5ed71164a3
3 changed files with 26 additions and 3 deletions
10
ChangeLog
10
ChangeLog
|
@ -1,3 +1,13 @@
|
|||
2007-01-24 Tim-Philipp Müller <tim at centricular dot net>
|
||||
|
||||
* ext/pango/gsttextoverlay.c: (gst_text_overlay_src_event),
|
||||
(gst_text_overlay_text_event):
|
||||
Don't unnecessarily ref (and then leak) upstream events if the text
|
||||
pad is not linked. Fixes #399948.
|
||||
|
||||
* tests/check/gst-plugins-base.supp:
|
||||
Add suppression for pango on edgy/x86 for textoverlay test.
|
||||
|
||||
2007-01-24 Wim Taymans <wim@fluendo.com>
|
||||
|
||||
* gst-libs/gst/rtp/gstrtpbuffer.h:
|
||||
|
|
|
@ -721,11 +721,14 @@ gst_text_overlay_src_event (GstPad * pad, GstEvent * event)
|
|||
}
|
||||
break;
|
||||
default:
|
||||
if (overlay->text_linked) {
|
||||
gst_event_ref (event);
|
||||
ret = gst_pad_push_event (overlay->video_sinkpad, event);
|
||||
if (overlay->text_linked) {
|
||||
ret = gst_pad_push_event (overlay->text_sinkpad, event);
|
||||
gst_pad_push_event (overlay->text_sinkpad, event);
|
||||
} else {
|
||||
ret = gst_pad_push_event (overlay->video_sinkpad, event);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
beach:
|
||||
|
@ -1120,6 +1123,7 @@ gst_text_overlay_text_event (GstPad * pad, GstEvent * event)
|
|||
GST_OBJECT_LOCK (overlay);
|
||||
overlay->text_flushing = TRUE;
|
||||
overlay->text_eos = TRUE;
|
||||
GST_INFO_OBJECT (overlay, "EOS");
|
||||
/* wake up the video chain, it might be waiting for a text buffer or
|
||||
* a text segment update */
|
||||
GST_TEXT_OVERLAY_BROADCAST (overlay);
|
||||
|
|
|
@ -10,3 +10,12 @@
|
|||
fun:theora_encode_YUVin
|
||||
}
|
||||
|
||||
# Suppression for pango on ubuntu edgy/x86 and textoverlay test
|
||||
{
|
||||
<pango>
|
||||
Memcheck:Param
|
||||
access(pathname)
|
||||
fun:access
|
||||
fun:pango_config_key_get
|
||||
fun:pango_find_map
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue