From 15b7375c44ec1f4f03d3f9b394da483aacac0015 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 25 Jan 2012 12:27:49 +0100 Subject: [PATCH] subtitle: fix merge --- gst/playback/gstsubtitleoverlay.c | 6 ++---- 1 file 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); -- 2.7.4