Mercurial > mplayer.hg
changeset 7390:2357ee501582
fixed to comply with new loader
| author | alex |
|---|---|
| date | Fri, 13 Sep 2002 21:55:55 +0000 |
| parents | 6f3dd9df2cc2 |
| children | 24c517eeac25 |
| files | libmpcodecs/ad_acm.c libmpcodecs/vd_vfw.c libmpcodecs/ve_vfw.c |
| diffstat | 3 files changed, 9 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpcodecs/ad_acm.c Fri Sep 13 20:46:23 2002 +0000 +++ b/libmpcodecs/ad_acm.c Fri Sep 13 21:55:55 2002 +0000 @@ -82,7 +82,7 @@ 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 @@ return(0); } -// MSACM_UnregisterAllDrivers(); + MSACM_UnregisterAllDrivers(); free(priv->o_wf); free(priv);
--- a/libmpcodecs/vd_vfw.c Fri Sep 13 20:46:23 2002 +0000 +++ b/libmpcodecs/vd_vfw.c Fri Sep 13 21:55:55 2002 +0000 @@ -156,9 +156,11 @@ 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 @@ priv->o_bih->biWidth=mpi->width; //mpi->stride[0]/(mpi->bpp/8); sh->bih->biSizeImage = len; - + #ifdef BUILD_VFWEX ret = ICDecompressEx(priv->handle, #else
--- a/libmpcodecs/ve_vfw.c Fri Sep 13 20:46:23 2002 +0000 +++ b/libmpcodecs/ve_vfw.c Fri Sep 13 21:55:55 2002 +0000 @@ -61,8 +61,8 @@ // 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;