subtitle: fix merge

diff --git a/gst/playback/gstsubtitleoverlay.c b/gst/playback/gstsubtitleoverlay.c
index 0321648..cd5af1f 100644 (file)
--- 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);