1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-18 04:45:33 +00:00

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

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28231 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2009-01-02 12:28:47 +00:00
parent 21f5949d4a
commit c6c7538c54

View File

@ -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; //the dimensions of our GWorld
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);