Mercurial > mplayer.hg

changeset 9581:0ef45318414a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
a warning fix and rgb15/16 support by Sascha Sommer
author alex
date Fri, 14 Mar 2003 12:46:49 +0000
parents 88eabd7a3b3b
children c9012dcd3a70
files loader/dshow/DS_VideoDecoder.c
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/loader/dshow/DS_VideoDecoder.c	Thu Mar 13 15:50:41 2003 +0000
+++ b/loader/dshow/DS_VideoDecoder.c	Fri Mar 14 12:46:49 2003 +0000
@@ -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