[0.11] gst-plugins-base: subtitle: fix merge

Wim Taymans wtay at kemper.freedesktop.org
Wed Jan 25 03:42:33 PST 2012


Module: gst-plugins-base
Branch: 0.11
Commit: 15b7375c44ec1f4f03d3f9b394da483aacac0015
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=15b7375c44ec1f4f03d3f9b394da483aacac0015

Author: Wim Taymans <wim.taymans at collabora.co.uk>
Date:   Wed Jan 25 12:27:49 2012 +0100

subtitle: fix merge

---

 gst/playback/gstsubtitleoverlay.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/gst/playback/gstsubtitleoverlay.c b/gst/playback/gstsubtitleoverlay.c
index 0321648..cd5af1f 100644
--- a/gst/playback/gstsubtitleoverlay.c
+++ b/gst/playback/gstsubtitleoverlay.c
@@ -1401,10 +1401,8 @@ gst_subtitle_overlay_change_state (GstElement * element,
 
       /* Set the pads back to blocking state */
       GST_SUBTITLE_OVERLAY_LOCK (self);
-      gst_pad_set_blocked_async_full (self->video_block_pad, TRUE,
-          _pad_blocked_cb, self, NULL);
-      gst_pad_set_blocked_async_full (self->subtitle_block_pad, TRUE,
-          _pad_blocked_cb, self, NULL);
+      block_video (self);
+      block_subtitle (self);
       GST_SUBTITLE_OVERLAY_UNLOCK (self);
 
       do_async_done (self);



More information about the gstreamer-commits mailing list