[MPlayer-dev-eng] Re: [PATCH] loader compiler warnings

[Dominik 'Rathann' Mierzejewski]

On Friday, 09 April 2004 at 00:40, Arpi wrote:
> Hi,
> 
> > > >This is our code (not in avifile's loader), so we may mess with it. ;)
> > 
> > Yes. There's some additional code (i.e. to support QuickTime DLLs), which
> > is not in avifile. I don't see a problem changing that code, because it
> > may produce rejects when syncing with avifile anyway.
> 
> the quicktime support code was synced back to avifile.
> (ie. patches sent & applied to af)

I hate to contradict you, but it appears they are not synced. A fresh
checkout of avifile from SF's CVS diffed with MPlayer's loader shows it
clearly.

Example:
diff -ru /home/dominik/cvs/avifile/plugins/libwin32/loader/win32.c /home/dominik/build/pkg/BUILD/MPlayer-20040409/loader/win32.c
--- /home/dominik/cvs/avifile/plugins/libwin32/loader/win32.c   Mon May 12 12:15:46 2003 
+++ /home/dominik/build/pkg/BUILD/MPlayer-20040409/loader/win32.c       Fri Apr  9 01:24:46 2004 
@@ -787,6 +850,63 @@
     return (void *)ret;
 }
 
+#ifdef QTX 
+static void* WINAPI expWaitForMultipleObjects(int count, void** objects, 
+                   int WaitAll, int duration) 
+{ 
[...]
@@ -2060,17 +2240,32 @@
     dbgprintf("GetStdHandle(0x%x) => 0x%x\n", z+0x1234);
     return z+0x1234;
 }
+ 
+#ifdef QTX 
+#define FILE_HANDLE_quicktimeqts       ((HANDLE)0x444) 
+#define FILE_HANDLE_quicktimeqtx       ((HANDLE)0x445) 
+#endif 
+ 
 static int WINAPI expGetFileType(int handle)
 {
     dbgprintf("GetFileType(0x%x) => 0x3 = pipe\n", handle);
[...]

Unless there's some other avifile CVS repository, you seem to be wrong.
I used
cvs -d:pserver:anonymous at cvs.avifile.sourceforge.net:/cvsroot/avifile co avifile

-- 
MPlayer RPMs maintainer: http://greysector.rangers.eu.org/mplayer.html
"I am Grey. I stand between the candle and the star. We are Grey.
 We stand between the darkness ... and the light."
        -- Delenn in Grey Council in Babylon 5:"Babylon Squared"