Mercurial > mplayer.hg

changeset 4205:c42ab0e5bbbc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
possible sig11 fixed - noticed by Fredrik Kuivinen <freku045@student.liu.se>
author arpi
date Thu, 17 Jan 2002 00:49:21 +0000
parents a451ba84410d
children bb7dc35902ff
files loader/dshow/DS_VideoDecoder.c
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/loader/dshow/DS_VideoDecoder.c	Thu Jan 17 00:39:27 2002 +0000
+++ b/loader/dshow/DS_VideoDecoder.c	Thu Jan 17 00:49:21 2002 +0000
@@ -104,10 +104,10 @@
         
 	bihs = (format->biSize < (int) sizeof(BITMAPINFOHEADER)) ?
 	    sizeof(BITMAPINFOHEADER) : format->biSize;
-        bihs = sizeof(VIDEOINFOHEADER) - sizeof(BITMAPINFOHEADER) + bihs;
      
         this->iv.m_bh = (BITMAPINFOHEADER*)malloc(bihs);
         memcpy(this->iv.m_bh, format, bihs);
+
         this->iv.m_State = STOP;
         //this->iv.m_pFrame = 0;
         this->iv.m_Mode = DIRECT;
@@ -116,6 +116,7 @@
         this->iv.m_fQuality = 0.0f;
         this->iv.m_bCapable16b = true;
                 
+        bihs += sizeof(VIDEOINFOHEADER) - sizeof(BITMAPINFOHEADER);
 	this->m_sVhdr = (VIDEOINFOHEADER*)malloc(bihs);
 	memset(this->m_sVhdr, 0, bihs);
 	memcpy(&this->m_sVhdr->bmiHeader, this->iv.m_bh, this->iv.m_bh->biSize);