diff options
| author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-09-13 21:55:55 +0000 |
|---|---|---|
| committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-09-13 21:55:55 +0000 |
| commit | d066ee0ea8aea0ed5a0480709e8a9b577bd5e51e (patch) | |
| tree | 06f9fbe07cf13f027db39028a84e17a1eac103c9 /libmpcodecs | |
| parent | 1564cfa9ab58acb7d0d5dad32274cfb2b086185c (diff) | |
| download | mpv-d066ee0ea8aea0ed5a0480709e8a9b577bd5e51e.tar.bz2 mpv-d066ee0ea8aea0ed5a0480709e8a9b577bd5e51e.tar.xz | |
fixed to comply with new loader
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7391 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/ad_acm.c | 4 | ||||
| -rw-r--r-- | libmpcodecs/vd_vfw.c | 8 | ||||
| -rw-r--r-- | libmpcodecs/ve_vfw.c | 4 |
3 files changed, 9 insertions, 7 deletions
diff --git a/libmpcodecs/ad_acm.c b/libmpcodecs/ad_acm.c index 2fc800d446..6f46675025 100644 --- a/libmpcodecs/ad_acm.c +++ b/libmpcodecs/ad_acm.c @@ -82,7 +82,7 @@ static int preinit(sh_audio_t *sh_audio) print_wave_header(priv->o_wf); } - win32_codec_name = sh_audio->codec->dll; + MSACM_RegisterDriver((const char *)sh_audio->codec->dll, in_fmt->wFormatTag, 0); ret = acmStreamOpen(&priv->handle, (HACMDRIVER)NULL, in_fmt, priv->o_wf, NULL, 0, 0, 0); if (ret) @@ -150,7 +150,7 @@ static void uninit(sh_audio_t *sh) return(0); } -// MSACM_UnregisterAllDrivers(); + MSACM_UnregisterAllDrivers(); free(priv->o_wf); free(priv); diff --git a/libmpcodecs/vd_vfw.c b/libmpcodecs/vd_vfw.c index 0fff261a4b..5b3a31caf9 100644 --- a/libmpcodecs/vd_vfw.c +++ b/libmpcodecs/vd_vfw.c @@ -156,9 +156,11 @@ static int init(sh_video_t *sh){ mp_msg(MSGT_WIN32,MSGL_V,"======= Win32 (VFW) VIDEO Codec init =======\n"); - win32_codec_name = sh->codec->dll; + +// 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( 0x63646976, sh->bih->biCompression, ICMODE_DECOMPRESS); + priv->handle = ICOpen( 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; @@ -301,7 +303,7 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ priv->o_bih->biWidth=mpi->width; //mpi->stride[0]/(mpi->bpp/8); sh->bih->biSizeImage = len; - + #ifdef BUILD_VFWEX ret = ICDecompressEx(priv->handle, #else diff --git a/libmpcodecs/ve_vfw.c b/libmpcodecs/ve_vfw.c index d13f82ad8e..eaf1c97446 100644 --- a/libmpcodecs/ve_vfw.c +++ b/libmpcodecs/ve_vfw.c @@ -61,8 +61,8 @@ static BITMAPINFOHEADER* vfw_open_encoder(char *dll_name, BITMAPINFOHEADER *inpu // memset(&sh_video->o_bih, 0, sizeof(BITMAPINFOHEADER)); // output_bih->biSize = sizeof(BITMAPINFOHEADER); - win32_codec_name = dll_name; - encoder_hic = ICOpen( 0x63646976, out_fourcc, ICMODE_COMPRESS); +// encoder_hic = ICOpen( 0x63646976, out_fourcc, ICMODE_COMPRESS); + encoder_hic = ICOpen( dll_name, out_fourcc, ICMODE_COMPRESS); if(!encoder_hic){ mp_msg(MSGT_WIN32,MSGL_ERR,"ICOpen failed! unknown codec / wrong parameters?\n"); return NULL; |