[Mplayer-cvslog] CVS: main/loader/DirectShow DS_AudioDec.cpp,1.5,1.6 DS_VideoDec.cpp,1.15,1.16 DS_VideoDecoder.cpp,1.4,1.5

[Arpi of Ize]

Update of /cvsroot/mplayer/main/loader/DirectShow
In directory mplayer:/var/tmp.root/cvs-serv8650

Modified Files:
	DS_AudioDec.cpp DS_VideoDec.cpp DS_VideoDecoder.cpp 
Log Message:
setup_FS.c -> ldt_keeper.c (avifile sync)

Index: DS_AudioDec.cpp
===================================================================
RCS file: /cvsroot/mplayer/main/loader/DirectShow/DS_AudioDec.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DS_AudioDec.cpp	16 Aug 2001 00:50:02 -0000	1.5
+++ DS_AudioDec.cpp	4 Oct 2001 00:07:15 -0000	1.6
@@ -18,6 +18,8 @@
 
 #include "DS_AudioDec.h"
 
+#include "ldt_keeper.h"
+
 //    DS_Decoder(const CodecInfo& info, const WAVEFORMATEX*);
 //    virtual ~DS_Decoder();
 //    virtual int Convert(const void*, size_t, void*, size_t, size_t*, size_t*);
@@ -25,13 +27,10 @@
 
 static void* _handle;
 
-extern "C" void Setup_LDT_Keeper();
-extern "C" void setup_FS_Segment();
-
 extern "C" int DS_AudioDecoder_Open(char* dllname, GUID* guid, WAVEFORMATEX* wf){
 
     Setup_LDT_Keeper();
-    setup_FS_Segment();
+    Setup_FS_Segment();
 
     CodecInfo ci;
     ci.dll=dllname;
@@ -55,7 +54,7 @@
 	     unsigned char* out_data, unsigned out_size,
 	     unsigned* size_read, unsigned* size_written){
     DS_AudioDecoder* dec=(DS_AudioDecoder*)_handle;
-    setup_FS_Segment();
+    Setup_FS_Segment();
     return dec->Convert( (void*)in_data,(size_t)in_size,
 			 (void*)out_data,(size_t)out_size,
 			 (size_t*)size_read, (size_t*)size_written );

Index: DS_VideoDec.cpp
===================================================================
RCS file: /cvsroot/mplayer/main/loader/DirectShow/DS_VideoDec.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- DS_VideoDec.cpp	27 Aug 2001 23:56:15 -0000	1.15
+++ DS_VideoDec.cpp	4 Oct 2001 00:07:15 -0000	1.16
@@ -20,11 +20,10 @@
 
 #include "DS_VideoDec.h"
 
+#include "ldt_keeper.h"
+
 static void* _handle; // will be parameter later...
 static char** _d_ptr;  // will be parameter later...
-
-extern "C" void Setup_LDT_Keeper();
-extern "C" void setup_FS_Segment();
 
 extern "C" int DS_VideoDecoder_Open(char* dllname, GUID* guid, BITMAPINFOHEADER* format, int flip,char** d_ptr){
 

Index: DS_VideoDecoder.cpp
===================================================================
RCS file: /cvsroot/mplayer/main/loader/DirectShow/DS_VideoDecoder.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DS_VideoDecoder.cpp	31 Aug 2001 19:19:15 -0000	1.4
+++ DS_VideoDecoder.cpp	4 Oct 2001 00:07:15 -0000	1.5
@@ -24,8 +24,9 @@
 
 #define __MODULE__ "DirectShow_VideoDecoder"
 
+#include "ldt_keeper.h"
+
 extern "C" char* def_path;
-extern "C" void setup_FS_Segment();
 
 using namespace std;
 
@@ -232,7 +233,7 @@
     // crashes inside ...->Receive() fixed now?
     //
     // nope - but this is surely helpfull - I'll try some more experiments
-    setup_FS_Segment();
+    Setup_FS_Segment();
 #if 0
     if (!m_pDS_Filter || !m_pDS_Filter->m_pImp
 	|| !m_pDS_Filter->m_pImp->vt