summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOgnyan Tonchev <otonchev@gmail.com>2014-09-30 19:17:04 +0200
committerSebastian Dröge <sebastian@centricular.com>2014-09-30 23:15:29 +0300
commitd48e022c137fea5480462f1433b9e44c113e2805 (patch)
tree131e0176456a1a74b7ae4fd3bd05c436f3b5f4de
parent404a80e38a508c13a9e9b7f9b1da70f3ccb2a77b (diff)
media: set state to unpreparing when unprepare is initiated
https://bugzilla.gnome.org/show_bug.cgi?id=737675
-rw-r--r--gst/rtsp-server/rtsp-media.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/gst/rtsp-server/rtsp-media.c b/gst/rtsp-server/rtsp-media.c
index 6b81e25..1b80729 100644
--- a/gst/rtsp-server/rtsp-media.c
+++ b/gst/rtsp-server/rtsp-media.c
@@ -2471,6 +2471,7 @@ default_unprepare (GstRTSPMedia * media)
/* we need to go to playing again for the EOS to propagate, normally in this
* state, nothing is receiving data from us anymore so this is ok. */
set_state (media, GST_STATE_PLAYING);
+ gst_rtsp_media_set_status (media, GST_RTSP_MEDIA_STATUS_UNPREPARING);
} else {
finish_unprepare (media);
}
@@ -2511,8 +2512,6 @@ gst_rtsp_media_unprepare (GstRTSPMedia * media)
set_target_state (media, GST_STATE_NULL, FALSE);
success = TRUE;
- gst_rtsp_media_set_status (media, GST_RTSP_MEDIA_STATUS_UNPREPARING);
-
if (priv->status == GST_RTSP_MEDIA_STATUS_PREPARED) {
GstRTSPMediaClass *klass;