Mercurial > mplayer.hg
changeset 22367:97639699240b
Update 3ivx decoder to latest version and allow it to load required library.
| author | voroshil |
|---|---|
| date | Thu, 01 Mar 2007 02:26:08 +0000 |
| parents | ce25d75021e8 |
| children | 8e9f3809b4be |
| files | etc/codecs.conf loader/win32.c |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/etc/codecs.conf Thu Mar 01 02:06:22 2007 +0000 +++ b/etc/codecs.conf Thu Mar 01 02:26:08 2007 +0000 @@ -1217,11 +1217,11 @@ out YV12,IYUV,I420 videocodec 3ivX - info "3ivx Delta 3.5" - status crashing + info "3ivx Delta 4.5" + status working fourcc 3IV1 driver dshow - dll "3ivxdmo.dll" + dll "3ivxDSDecoder.ax" ; 3ivx.dll is also required guid 0x0E6772C0, 0xDD80, 0x11D4, 0xB5, 0x8f, 0xA8, 0x6B, 0x66, 0xd0, 0x61, 0x1c out YV12 out YUY2
--- a/loader/win32.c Thu Mar 01 02:06:22 2007 +0000 +++ b/loader/win32.c Thu Mar 01 02:26:08 2007 +0000 @@ -5432,7 +5432,7 @@ #ifndef LOADLIB_TRY_NATIVE /* hack for vss h264 */ - if (!strcmp(library,"vssh264core.dll")) + if (!strcmp(library,"vssh264core.dll") || !strcmp(library,"3ivx.dll")) #endif /* ok, this is a hack, and a big memory leak. should be fixed. - alex */ {