diff options
| author | sesse <sesse@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-03-16 14:30:31 +0000 |
|---|---|---|
| committer | sesse <sesse@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-03-16 14:30:31 +0000 |
| commit | 9ffcd31e7d621fa0441a1908d28d2ea34e5967a7 (patch) | |
| tree | 1638ed98c7d1cbed44348374d2dce6a4ec1f2d30 /libmpcodecs | |
| parent | c19c71be2b6707c66e9216563f48bc7a6580e5ac (diff) | |
| download | mpv-9ffcd31e7d621fa0441a1908d28d2ea34e5967a7.tar.bz2 mpv-9ffcd31e7d621fa0441a1908d28d2ea34e5967a7.tar.xz | |
Fix libmpcodecs/vd_qtvideo.c compilation on OS X:
- 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
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vd_qtvideo.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libmpcodecs/vd_qtvideo.c b/libmpcodecs/vd_qtvideo.c index ea7aa4eaa1..cfe815056d 100644 --- a/libmpcodecs/vd_qtvideo.c +++ b/libmpcodecs/vd_qtvideo.c @@ -59,7 +59,7 @@ static HINSTANCE qtime_qts; // handle to the preloaded quicktime.qts static HMODULE handler; static OSErr (*InitializeQTML)(long flags); static OSErr (*EnterMovies)(void); -static OSErr (*ExitMovies)(void); +static void (*ExitMovies)(void); static OSErr (*DecompressSequenceBegin)(ImageSequence *seqID, ImageDescriptionHandle desc, CGrafPtr port, @@ -99,9 +99,7 @@ static int control(sh_video_t *sh,int cmd,void* arg,...){ // init driver static int init(sh_video_t *sh){ -#ifndef CONFIG_QUICKTIME OSErr result = 1; -#endif if (sh->ImageDesc == NULL) { 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"); 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"); DecompressSequenceFrameS = (OSErr (*)(ImageSequence,Ptr,long,CodecFlags,CodecFlags*,ICMCompletionProcRecordPtr))GetProcAddress(handler, "DecompressSequenceFrameS"); GetGWorldPixMap = (PixMapHandle (*)(GWorldPtr))GetProcAddress(handler, "GetGWorldPixMap"); @@ -254,8 +252,7 @@ static void uninit(sh_video_t *sh){ CDSequenceEnd(imageSeq); imageSeq = 0; } - result=ExitMovies(); - mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"ExitMovies returned %d\n",result); + ExitMovies(); } // decode a frame |