[Mplayer-cvslog] CVS: 0_90/loader/dshow DS_VideoDecoder.c,1.25,1.26

Arpi of Ize arpi at mplayerhq.hu
Mon Mar 17 01:55:26 CET 2003


Update of /cvsroot/mplayer/0_90/loader/dshow
In directory mail:/var/tmp.root/cvs-serv25616/loader/dshow

Modified Files:
	DS_VideoDecoder.c 
Log Message:
backport: warning fix, 15bpp fix


Index: DS_VideoDecoder.c
===================================================================
RCS file: /cvsroot/mplayer/0_90/loader/dshow/DS_VideoDecoder.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- DS_VideoDecoder.c	25 Feb 2003 16:07:52 -0000	1.25
+++ DS_VideoDecoder.c	17 Mar 2003 00:55:24 -0000	1.26
@@ -80,7 +80,7 @@
 		{16, fccYVYU, &MEDIASUBTYPE_YVYU, CAP_YVYU},
 		{12, fccI420, &MEDIASUBTYPE_I420, CAP_I420},
 		{9,  fccYVU9, &MEDIASUBTYPE_YVU9, CAP_YVU9},
-		{0},
+		{0, 0, 0, 0},
 	    };
 
 
@@ -451,7 +451,10 @@
 	}
 
         if (ok) {
-	    this->iv.m_obh.biBitCount=bits;
+	    if (bits == 15)
+		this->iv.m_obh.biBitCount=16;
+	    else
+		this->iv.m_obh.biBitCount=bits;
             if( bits == 15 || bits == 16 ) {
 	      this->iv.m_obh.biSize=sizeof(BITMAPINFOHEADER)+12;
 	      this->iv.m_obh.biCompression=3;//BI_BITFIELDS



More information about the MPlayer-cvslog mailing list