diff options
| author | durchflieger <durchflieger> | 2011-04-11 08:29:17 +0000 |
|---|---|---|
| committer | durchflieger <durchflieger> | 2011-04-11 08:29:17 +0000 |
| commit | f96eca302c7b3de09ee191b90e17e63cae14c1c3 (patch) | |
| tree | 280a5b207ce7c5ce4e6312630559bd2b68dc4a33 | |
| parent | 70ef71460b056a25de53fcb4db6a3091b85764bc (diff) | |
| download | xineliboutput-f96eca302c7b3de09ee191b90e17e63cae14c1c3.tar.gz xineliboutput-f96eca302c7b3de09ee191b90e17e63cae14c1c3.tar.bz2 | |
Do not lock last frame.
In xine-lib 1.2 function 'get_last_frame' returns already a locked frame.
This new behavior was introduced by a recent patch.
| -rw-r--r-- | xine_frontend.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/xine_frontend.c b/xine_frontend.c index 376c101e..bcd59c83 100644 --- a/xine_frontend.c +++ b/xine_frontend.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: xine_frontend.c,v 1.119 2011-03-10 10:03:12 durchflieger Exp $ + * $Id: xine_frontend.c,v 1.120 2011-04-11 08:29:17 durchflieger Exp $ * */ @@ -2025,8 +2025,10 @@ static char *fe_grab(frontend_t *this_gen, int *size, int jpeg, return img; #else vo_frame_t *frame = this->stream->video_out->get_last_frame (this->stream->video_out); +#if XINE_VERSION_CODE < 10190 if(frame) frame->lock(frame); +#endif this->stream->xine->port_ticket->release(this->stream->xine->port_ticket, 0); if(!frame) { |