Mercurial > mplayer.hg

changeset 1362:11673118f37f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix segfault in DShow video decoder. Using directshow, the sh_video->out_out_buffer is NULL on the first few decoded frames, and is initialized in loader/DirectShow/outputpin.cpp, method COutputPin::Receive(), while the video is already running. Do not try to display a frame while sh_video->out_out_buffer is still NULL. Such a test was present in the previous to last revision of this file, but was lost in the last revision.
author jkeil
date Fri, 20 Jul 2001 11:35:47 +0000
parents c9d6ed128abd
children 7203fb5ec26a
files dec_video.c
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/dec_video.c	Fri Jul 20 10:13:17 2001 +0000
+++ b/dec_video.c	Fri Jul 20 11:35:47 2001 +0000
@@ -332,7 +332,7 @@
 #ifdef USE_DIRECTSHOW
   case 4: {        // W32/DirectShow
     if(drop_frame<2) DS_VideoDecoder_DecodeFrame(start, in_size, 0, !drop_frame);
-    if(!drop_frame) blit_frame=3;
+    if(!drop_frame && sh_video->our_out_buffer) blit_frame=3;
     break;
   }
 #endif