projects
/
platform
/
upstream
/
gst-rtsp-server.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0b94f50
)
media: don't unlock when conversion fails
author
Wim Taymans
<wim.taymans@collabora.co.uk>
Tue, 25 Jun 2013 13:46:41 +0000
(15:46 +0200)
committer
Wim Taymans
<wim.taymans@collabora.co.uk>
Tue, 25 Jun 2013 13:46:41 +0000
(15:46 +0200)
Don't unlock the state lock when conversion fails because it was not locked.
gst/rtsp-server/rtsp-media.c
patch
|
blob
|
history
diff --git
a/gst/rtsp-server/rtsp-media.c
b/gst/rtsp-server/rtsp-media.c
index c343a4df3e8aab02e09fd91d1647b2bd57e18a8e..49e86f233b47489717caafb1a1a333ea62ac5991 100644
(file)
--- a/
gst/rtsp-server/rtsp-media.c
+++ b/
gst/rtsp-server/rtsp-media.c
@@
-1135,9
+1135,8
@@
gst_rtsp_media_get_range_string (GstRTSPMedia * media, gboolean play,
g_mutex_unlock (&priv->lock);
g_rec_mutex_unlock (&priv->state_lock);
- if (!klass->convert_range (media, &range, unit))
{
+ if (!klass->convert_range (media, &range, unit))
goto conversion_failed;
- }
result = gst_rtsp_range_to_string (&range);
@@
-1153,7
+1152,6
@@
not_prepared:
conversion_failed:
{
GST_WARNING ("range conversion to unit %d failed", unit);
- g_rec_mutex_unlock (&priv->state_lock);
return NULL;
}
}