summaryrefslogtreecommitdiff
path: root/src/xine-engine
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2007-12-14 21:45:16 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2007-12-14 21:45:16 +0000
commit35de2d5310582d38d59df87432ae3c37ad84edbd (patch)
treeaac5644f379d28ee8dcb378f6546f41c926f20ff /src/xine-engine
parent32c1ac5c77e9d6c972689d8dc31b4c5d4ff80d78 (diff)
parent6bbfd480d0d173887305db527b641f832b6c4310 (diff)
downloadxine-lib-35de2d5310582d38d59df87432ae3c37ad84edbd.tar.gz
xine-lib-35de2d5310582d38d59df87432ae3c37ad84edbd.tar.bz2
Merge from 1.1.
--HG-- rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c rename : src/libfaad/xine_faad_decoder.c => src/libxineadec/xine_faad_decoder.c
Diffstat (limited to 'src/xine-engine')
-rw-r--r--src/xine-engine/video_out.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/xine-engine/video_out.c b/src/xine-engine/video_out.c
index 575017301..8c9810da1 100644
--- a/src/xine-engine/video_out.c
+++ b/src/xine-engine/video_out.c
@@ -979,6 +979,7 @@ static vo_frame_t *get_next_frame (vos_t *this, int64_t cur_vpts,
if (!img->stream ||
_x_stream_info_get(img->stream, XINE_STREAM_INFO_VIDEO_HAS_STILL) ||
+ !img->stream->video_fifo ||
img->stream->video_fifo->size(img->stream->video_fifo) < 10) {
lprintf ("possible still frame\n");