RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-29 23:07:56 +00:00
Code Issues Releases Wiki Activity

Fix libmpcodecs/vd_qtvideo.c compilation on OS X:

Browse Source 
- Declare the "result" variable even for native QuickTime.
 - ExitMovies returns void; don't check its result value.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30911 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
sesse 2010-03-16 14:30:31 +00:00
parent c19c71be2b
commit 9ffcd31e7d
1 changed files with 3 additions and 6 deletions

9
libmpcodecs/vd_qtvideo.c
View File

@ -59,7 +59,7 @@ static HINSTANCE qtime_qts; // handle to the preloaded quicktime.qts
static HMODULE handler; static HMODULE handler;
static OSErr (*InitializeQTML)(long flags); static OSErr (*InitializeQTML)(long flags);
static OSErr (*EnterMovies)(void); static OSErr (*EnterMovies)(void);
static OSErr (*ExitMovies)(void); static void (*ExitMovies)(void);
static OSErr (*DecompressSequenceBegin)(ImageSequence *seqID, static OSErr (*DecompressSequenceBegin)(ImageSequence *seqID,
ImageDescriptionHandle desc, ImageDescriptionHandle desc,
CGrafPtr port, CGrafPtr port,
@ -99,9 +99,7 @@ static int control(sh_video_t *sh,int cmd,void* arg,...){
// init driver // init driver
static int init(sh_video_t *sh){ static int init(sh_video_t *sh){
#ifndef CONFIG_QUICKTIME
OSErr result = 1; OSErr result = 1;
#endif
if (sh->ImageDesc == NULL) { if (sh->ImageDesc == NULL) {
mp_msg(MSGT_DECVIDEO,MSGL_ERR,"sh->ImageDesc not set, cannot use binary QuickTime codecs (try -demuxer mov?)\n"); mp_msg(MSGT_DECVIDEO,MSGL_ERR,"sh->ImageDesc not set, cannot use binary QuickTime codecs (try -demuxer mov?)\n");
@ -128,7 +126,7 @@ static int init(sh_video_t *sh){
InitializeQTML = (OSErr (*)(long))GetProcAddress(handler, "InitializeQTML"); InitializeQTML = (OSErr (*)(long))GetProcAddress(handler, "InitializeQTML");
EnterMovies = (OSErr (*)(void))GetProcAddress(handler, "EnterMovies"); EnterMovies = (OSErr (*)(void))GetProcAddress(handler, "EnterMovies");
ExitMovies = (OSErr (*)(void))GetProcAddress(handler, "ExitMovies"); ExitMovies = (void (*)(void))GetProcAddress(handler, "ExitMovies");
DecompressSequenceBegin = (OSErr (*)(ImageSequence*,ImageDescriptionHandle,CGrafPtr,void *,const Rect *,MatrixRecordPtr,short,RgnHandle,CodecFlags,CodecQ,DecompressorComponent))GetProcAddress(handler, "DecompressSequenceBegin"); DecompressSequenceBegin = (OSErr (*)(ImageSequence*,ImageDescriptionHandle,CGrafPtr,void *,const Rect *,MatrixRecordPtr,short,RgnHandle,CodecFlags,CodecQ,DecompressorComponent))GetProcAddress(handler, "DecompressSequenceBegin");
DecompressSequenceFrameS = (OSErr (*)(ImageSequence,Ptr,long,CodecFlags,CodecFlags*,ICMCompletionProcRecordPtr))GetProcAddress(handler, "DecompressSequenceFrameS"); DecompressSequenceFrameS = (OSErr (*)(ImageSequence,Ptr,long,CodecFlags,CodecFlags*,ICMCompletionProcRecordPtr))GetProcAddress(handler, "DecompressSequenceFrameS");
GetGWorldPixMap = (PixMapHandle (*)(GWorldPtr))GetProcAddress(handler, "GetGWorldPixMap"); GetGWorldPixMap = (PixMapHandle (*)(GWorldPtr))GetProcAddress(handler, "GetGWorldPixMap");
@ -254,8 +252,7 @@ static void uninit(sh_video_t *sh){
CDSequenceEnd(imageSeq); CDSequenceEnd(imageSeq);
imageSeq = 0; imageSeq = 0;
} }
result=ExitMovies(); ExitMovies();
mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"ExitMovies returned %d\n",result);
} }
// decode a frame // decode a frame