diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-08-01 03:30:38 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-08-01 03:30:38 +0000 |
| commit | 49987047a39ca37633976e584082a8bf84b079ea (patch) | |
| tree | bb0f7be6b5dd45b02e0ffd880f77534420022365 | |
| parent | 1e01d6ef4911ab321ad7e04773f0340ab02b14f3 (diff) | |
| download | mpv-49987047a39ca37633976e584082a8bf84b079ea.tar.bz2 mpv-49987047a39ca37633976e584082a8bf84b079ea.tar.xz | |
Ugly hack to make xanlib.dll work.
See also http://samples.mplayerhq.hu/game-formats/wc4-xan/
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23981 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | etc/codecs.conf | 8 | ||||
| -rw-r--r-- | loader/pe_image.c | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index c4f5d3fe96..a0a3a2074e 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -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 diff --git a/loader/pe_image.c b/loader/pe_image.c index 225d0146f0..f216cd8354 100644 --- a/loader/pe_image.c +++ b/loader/pe_image.c @@ -546,7 +546,8 @@ HMODULE PE_LoadImage( int handle, LPCSTR filename, WORD *version ) * 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) |