From 61c5a99851ea41449a513619dd68791c93e30ef3 Mon Sep 17 00:00:00 2001 From: arpi Date: Sun, 22 Sep 2002 00:43:14 +0000 Subject: wine headers cleanup - WAVEFORMATEX & BITMAPINFOHEADER decl moved to stheader.h - lots of useless include wine/* removed from mplayer code - fixed few warnings git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7472 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/vd_vfw.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'libmpcodecs/vd_vfw.c') diff --git a/libmpcodecs/vd_vfw.c b/libmpcodecs/vd_vfw.c index 5b3a31caf9..bc85ee623d 100644 --- a/libmpcodecs/vd_vfw.c +++ b/libmpcodecs/vd_vfw.c @@ -7,13 +7,11 @@ #ifdef USE_WIN32DLL -#include "loader.h" -//#include "wine/mmreg.h" -#include "wine/vfw.h" -#include "wine/avifmt.h" - #include "vd_internal.h" +#include "wine/driver.h" +#include "wine/vfw.h" + static vd_info_t info = { #ifdef BUILD_VFWEX "Win32/VfWex video codecs", @@ -143,7 +141,6 @@ static int control(sh_video_t *sh,int cmd,void* arg,...){ // init driver static int init(sh_video_t *sh){ HRESULT ret; - int yuv=0; // unsigned int outfmt=sh->codec->outfmt[sh->outfmtidx]; int i, o_bih_len; vd_vfw_ctx *priv; @@ -160,7 +157,7 @@ static int init(sh_video_t *sh){ // win32_codec_name = sh->codec->dll; // sh->hic = ICOpen( 0x63646976, sh->bih->biCompression, ICMODE_FASTDECOMPRESS); // priv->handle = ICOpen( 0x63646976, sh->bih->biCompression, ICMODE_DECOMPRESS); - priv->handle = ICOpen( sh->codec->dll, sh->bih->biCompression, ICMODE_DECOMPRESS); + priv->handle = ICOpen( (long)(sh->codec->dll), sh->bih->biCompression, ICMODE_DECOMPRESS); if(!priv->handle){ mp_msg(MSGT_WIN32,MSGL_ERR,"ICOpen failed! unknown codec / wrong parameters?\n"); return 0; -- cgit v1.2.3