diff options
| author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-03-14 12:46:49 +0000 |
|---|---|---|
| committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-03-14 12:46:49 +0000 |
| commit | 722e6286b50e1f7a491fe32b94736d1d4c9a9522 (patch) | |
| tree | 8ca94891a5d75108902b4b3469c424388c9ad158 /loader | |
| parent | 1de0afc6a9d275bc5f5cd24edebb52d0b923fbae (diff) | |
| download | mpv-722e6286b50e1f7a491fe32b94736d1d4c9a9522.tar.bz2 mpv-722e6286b50e1f7a491fe32b94736d1d4c9a9522.tar.xz | |
a warning fix and rgb15/16 support by Sascha Sommer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9582 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/dshow/DS_VideoDecoder.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/loader/dshow/DS_VideoDecoder.c b/loader/dshow/DS_VideoDecoder.c index 0ef20269a9..231059109d 100644 --- a/loader/dshow/DS_VideoDecoder.c +++ b/loader/dshow/DS_VideoDecoder.c @@ -80,7 +80,7 @@ static ct check[] = { {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 @@ int DS_VideoDecoder_SetDestFmt(DS_VideoDecoder *this, int bits, unsigned int csp } 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 |