[MPlayer-cvslog] r28231 - trunk/libmpcodecs/vd_qtvideo.c

[diego]

Author: diego
Date: Fri Jan  2 13:28:47 2009
New Revision: 28231

Log:
Reorder #includes and #ifdefs to avoid warnings and excessive #ifdeffery.

Modified:
   trunk/libmpcodecs/vd_qtvideo.c

Modified: trunk/libmpcodecs/vd_qtvideo.c
==============================================================================
--- trunk/libmpcodecs/vd_qtvideo.c	Fri Jan  2 12:46:34 2009	(r28230)
+++ trunk/libmpcodecs/vd_qtvideo.c	Fri Jan  2 13:28:47 2009	(r28231)
@@ -3,19 +3,17 @@
 #include <inttypes.h>
 
 #include "config.h"
+#include "mp_msg.h"
+#include "mpbswap.h"
+#include "vd_internal.h"
 
 #ifdef CONFIG_QUICKTIME
 #include <QuickTime/ImageCodec.h>
 #define dump_ImageDescription(x)
-#endif
-
-#include "loader/wine/windef.h"
-
-#include "mp_msg.h"
-#include "vd_internal.h"
-
-#ifdef WIN32_LOADER
+#else
 #include "loader/ldt_keeper.h"
+#include "loader/qtx/qtxsdk/components.h"
+#include "loader/wine/windef.h"
 #endif
 
 static vd_info_t info = {
@@ -28,16 +26,6 @@ static vd_info_t info = {
 
 LIBVD_EXTERN(qtvideo)
 
-#include "mpbswap.h"
-
-#ifndef CONFIG_QUICKTIME
-#include "loader/qtx/qtxsdk/components.h"
-
-HMODULE   WINAPI LoadLibraryA(LPCSTR);
-FARPROC   WINAPI GetProcAddress(HMODULE,LPCSTR);
-int       WINAPI FreeLibrary(HMODULE);
-#endif
-
 //static ComponentDescription desc; // for FindNextComponent()
 static ComponentInstance ci=NULL; // codec handle
 //static CodecInfo cinfo;	// for ImageCodecGetCodecInfo()
@@ -50,10 +38,13 @@ static Rect OutBufferRect;              
 
 static GWorldPtr OutBufferGWorld = NULL;//a GWorld is some kind of description for a drawing environment
 static ImageDescriptionHandle framedescHandle;
-static HINSTANCE qtime_qts; // handle to the preloaded quicktime.qts
-static HMODULE handler;
 
 #ifndef CONFIG_QUICKTIME
+HMODULE   WINAPI LoadLibraryA(LPCSTR);
+FARPROC   WINAPI GetProcAddress(HMODULE,LPCSTR);
+int       WINAPI FreeLibrary(HMODULE);
+static    HINSTANCE qtime_qts; // handle to the preloaded quicktime.qts
+static    HMODULE handler;
 static    Component (*FindNextComponent)(Component prev,ComponentDescription* desc);
 static    OSErr (*GetComponentInfo)(Component prev,ComponentDescription* desc,Handle h1,Handle h2,Handle h3);
 static    long (*CountComponents)(ComponentDescription* desc);