setup_FS.c -> ldt_keeper.c (avifile sync)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2068 b3059339-0415-0410-9bf9-f77b7e298cf2

3 files changed, 9 insertions, 10 deletions

diff --git a/loader/dshow/DS_AudioDec.c b/loader/dshow/DS_AudioDec.c
index 9b462f631f..d96d513072 100644
--- a/loader/dshow/DS_AudioDec.c
+++ b/loader/dshow/DS_AudioDec.c
@@ -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 @@ extern "C" int DS_AudioDecoder_Convert(unsigned char* in_data, unsigned in_size,
 	     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 );
diff --git a/loader/dshow/DS_VideoDec.c b/loader/dshow/DS_VideoDec.c
index 60eb1d8d82..541fc34fa3 100644
--- a/loader/dshow/DS_VideoDec.c
+++ b/loader/dshow/DS_VideoDec.c
@@ -20,12 +20,11 @@
 
 #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){
 
     Setup_LDT_Keeper();
diff --git a/loader/dshow/DS_VideoDecoder.c b/loader/dshow/DS_VideoDecoder.c
index 60156166a3..c91eb70f77 100644
--- a/loader/dshow/DS_VideoDecoder.c
+++ b/loader/dshow/DS_VideoDecoder.c
@@ -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 @@ int DS_VideoDecoder::DecodeInternal(void* src, size_t size, int is_keyframe, CIm
     // 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