diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2005-11-14 23:48:19 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2005-11-14 23:48:19 +0000 |
| commit | 94392b8c7afce870311721de7b43292116e6a85a (patch) | |
| tree | e1ba984be00eac223953dfb787256ff2e5548482 | |
| parent | 8b9e719bd97a06e6ac2280171fcbaba41f6fbaa0 (diff) | |
| download | xine-lib-94392b8c7afce870311721de7b43292116e6a85a.tar.gz xine-lib-94392b8c7afce870311721de7b43292116e6a85a.tar.bz2 | |
fix problem with pause introduced by previous commit
CVS patchset: 7801
CVS date: 2005/11/14 23:48:19
| -rw-r--r-- | src/xine-engine/video_out.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/xine-engine/video_out.c b/src/xine-engine/video_out.c index 84ae32549..2c19daee9 100644 --- a/src/xine-engine/video_out.c +++ b/src/xine-engine/video_out.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_out.c,v 1.221 2005/11/14 23:12:16 miguelfreitas Exp $ + * $Id: video_out.c,v 1.222 2005/11/14 23:48:19 miguelfreitas Exp $ * * frame allocation / queuing / scheduling / output functions */ @@ -188,7 +188,8 @@ static vo_frame_t *vo_remove_from_img_buf_queue_int (img_buf_fifo_t *queue, int vo_frame_t *previous = NULL; while (!img || queue->locked_for_read) { - img = queue->first; + + img = (queue->locked_for_read) ? NULL : queue->first; #if EXPERIMENTAL_FRAME_QUEUE_OPTIMIZATION if (img) { |