diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-01-25 11:50:54 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-01-25 11:50:54 +0100 |
| commit | 68c0790817b4dedf8d4d028631e98d66171e73c0 (patch) | |
| tree | 1063f6bb873d4ab3bee85e2310e06ad9f9232261 /gst/playback/gstsubtitleoverlay.c | |
| parent | cd8742fdcb71e9bb3f987e5f98594c20b5c08134 (diff) | |
| parent | bd900a6c856c536c783aa7a53e3c6b19f3cb8bf9 (diff) | |
Merge branch 'master' into 0.11
Conflicts:
gst-libs/gst/interfaces/propertyprobe.c
sys/xvimage/xvimagesink.c
Diffstat (limited to 'gst/playback/gstsubtitleoverlay.c')
| -rw-r--r-- | gst/playback/gstsubtitleoverlay.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/gst/playback/gstsubtitleoverlay.c b/gst/playback/gstsubtitleoverlay.c index f3d28a677..032164893 100644 --- a/gst/playback/gstsubtitleoverlay.c +++ b/gst/playback/gstsubtitleoverlay.c @@ -1398,6 +1398,15 @@ gst_subtitle_overlay_change_state (GstElement * element, break; case GST_STATE_CHANGE_PAUSED_TO_READY: GST_DEBUG_OBJECT (self, "State change PAUSED->READY"); + + /* 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); + GST_SUBTITLE_OVERLAY_UNLOCK (self); + do_async_done (self); break; |