mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 01:30:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

subtitle: fix merge

Browse source
This commit is contained in:
Wim Taymans 2012-01-25 12:27:49 +01:00
parent e7575bc525
commit 15b7375c44
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gst/playback/gstsubtitleoverlay.c
View file

@ -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);