[MPlayer-cvslog] r23981 - in trunk: etc/codecs.conf loader/pe_image.c

[reimar]

Author: reimar
Date: Wed Aug  1 05:30:38 2007
New Revision: 23981

Log:
Ugly hack to make xanlib.dll work.
See also http://samples.mplayerhq.hu/game-formats/wc4-xan/


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

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	(original)
+++ trunk/etc/codecs.conf	Wed Aug  1 05:30:38 2007
@@ -2024,6 +2024,14 @@ videocodec fftxd
   dll txd
   out BGR32
 
+videocodec xan
+  info "XAN Video"
+  status working
+  fourcc Xxan
+  driver vfw
+  dll "xanlib.dll"
+  out BGR24,BGR15,BGR8 query,flip
+
 videocodec ffwc3
   info "FFmpeg XAN wc3"
   status buggy

Modified: trunk/loader/pe_image.c
==============================================================================
--- trunk/loader/pe_image.c	(original)
+++ trunk/loader/pe_image.c	Wed Aug  1 05:30:38 2007
@@ -546,7 +546,8 @@ HMODULE PE_LoadImage( int handle, LPCSTR
      *         to work (until we support shared sections properly).
      */
 
-    if ( nt->OptionalHeader.ImageBase & 0x80000000 )
+    if ( nt->OptionalHeader.ImageBase & 0x80000000 &&
+        !strstr(filename, "xanlib.dll"))
     {
         HMODULE sharedMod = (HMODULE)nt->OptionalHeader.ImageBase; 
         IMAGE_NT_HEADERS *sharedNt = (PIMAGE_NT_HEADERS)