diff options
| author | Torsten Jager <t.jager@gmx.de> | 2012-07-13 22:07:25 +0300 |
|---|---|---|
| committer | Torsten Jager <t.jager@gmx.de> | 2012-07-13 22:07:25 +0300 |
| commit | 40cf66ac06246bc3815f8fc08229e32c5780a51b (patch) | |
| tree | d89cebdce6cf60ee25aaf223ef0b73f1123d92e4 /src | |
| parent | 0971be62956b6d39bf3d6b063d269dfc6276d21f (diff) | |
| download | xine-lib-40cf66ac06246bc3815f8fc08229e32c5780a51b.tar.gz xine-lib-40cf66ac06246bc3815f8fc08229e32c5780a51b.tar.bz2 | |
video_out_opengl2: fix X access deadlock
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_out/video_out_opengl2.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/video_out/video_out_opengl2.c b/src/video_out/video_out_opengl2.c index 9ae0c5710..f281085b1 100644 --- a/src/video_out/video_out_opengl2.c +++ b/src/video_out/video_out_opengl2.c @@ -1221,9 +1221,11 @@ static void opengl2_display_frame( vo_driver_t *this_gen, vo_frame_t *frame_gen opengl2_redraw_needed( this_gen ); + XLockDisplay (this->display); pthread_mutex_lock(&this->drawable_lock); /* protect drawable from being changed */ opengl2_draw( this, frame ); pthread_mutex_unlock(&this->drawable_lock); /* allow changing drawable again */ + XUnlockDisplay (this->display); frame->vo_frame.free( &frame->vo_frame ); } |