Fixed a crash that happened when a video output was closed

img->stream->video_fifo can be 0

2 files changed, 2 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index c89b74b3d..5212cf99b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,7 @@ xine-lib (1.1.9) (unreleased)
   * DXR3 encoding with external ffmpeg should be fixed now.
     (This was broken by ffmpeg revision 9283).
   * Enabled the WMV VC1 (ffmpeg) codec.
+  * Fixed a crash that happened when a video output was closed
 
 xine-lib (1.1.8)
   * Send a channel-changed event to the frontend when receiving the SYNC
diff --git a/src/xine-engine/video_out.c b/src/xine-engine/video_out.c
index b961c6060..a5fd544d0 100644
--- a/src/xine-engine/video_out.c
+++ b/src/xine-engine/video_out.c
@@ -950,6 +950,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");