diff options
| author |  voroshil <voroshil@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-03-01 02:26:08 +0000 |
|---|---|---|
| committer | voroshil <voroshil@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-03-01 02:26:08 +0000 |
| commit | fe0982a10c70ffdf1a5139a0080b7d50ce96a5fc (patch) | |
| tree | 1ad4243049bd994480448c7ad459f1f6b3812f56 | |
| parent | 5d1d66f6db42b4d20f147737b4284037697ca5bc (diff) | |
Update 3ivx decoder to latest version and allow it to load required library.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22385 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | etc/codecs.conf | 6 | ||||
| -rw-r--r-- | loader/win32.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 62948d8b75..f3e170e92f 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -1217,11 +1217,11 @@ videocodec 3ivXxa 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 diff --git a/loader/win32.c b/loader/win32.c index aacd71ed4f..454049e1e2 100644 --- a/loader/win32.c +++ b/loader/win32.c @@ -5432,7 +5432,7 @@ void* LookupExternalByName(const char* library, const char* name) #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 */ { |