[MPlayer-cvslog] r22385 - in trunk: etc/codecs.conf loader/win32.c

[voroshil]

Author: voroshil
Date: Thu Mar  1 03:26:08 2007
New Revision: 22385

Modified:
   trunk/etc/codecs.conf
   trunk/loader/win32.c

Log:
Update 3ivx decoder to latest version and allow it to load required library.


Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	(original)
+++ trunk/etc/codecs.conf	Thu Mar  1 03:26:08 2007
@@ -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

Modified: trunk/loader/win32.c
==============================================================================
--- trunk/loader/win32.c	(original)
+++ trunk/loader/win32.c	Thu Mar  1 03:26:08 2007
@@ -5432,7 +5432,7 @@ void* LookupExternalByName(const char* l
 
 #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 */
     {