summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorphintuka <phintuka>2012-01-30 10:49:34 +0000
committerphintuka <phintuka>2012-01-30 10:49:34 +0000
commit4fc4b48955b8ead14f45909e23c4f6132ca95160 (patch)
tree1d380d69baf32a3a3b4da14ccb596f054e4a6e01
parent9d93de27ff53d714266257ec3d842b47a39a46e2 (diff)
downloadxineliboutput-4fc4b48955b8ead14f45909e23c4f6132ca95160.tar.gz
xineliboutput-4fc4b48955b8ead14f45909e23c4f6132ca95160.tar.bz2
Improved locking in opengl_osd_show()
-rw-r--r--xine_sxfe_frontend.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/xine_sxfe_frontend.c b/xine_sxfe_frontend.c
index 199e54ed..93e536b6 100644
--- a/xine_sxfe_frontend.c
+++ b/xine_sxfe_frontend.c
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: xine_sxfe_frontend.c,v 1.195 2012-01-30 10:46:45 phintuka Exp $
+ * $Id: xine_sxfe_frontend.c,v 1.196 2012-01-30 10:49:34 phintuka Exp $
*
*/
@@ -1580,11 +1580,11 @@ static void opengl_osd_show(sxfe_t *this)
if (this->osd_visible)
return;
+ pthread_mutex_lock(&this->opengl_osd_texture_img_mutex);
+
this->osd_visible = 1;
this->video_win_active = 0;
- pthread_mutex_lock(&this->opengl_osd_texture_img_mutex);
-
free(this->opengl_osd_texture_img);
size_t size = sizeof(uint32_t) * this->osd_width * this->osd_height;
this->opengl_osd_texture_img = malloc(size);