diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 17:11:04 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 17:11:04 +0300 |
| commit | 95fba94860a02be5b50c4050f9ba2ac41daea3c2 (patch) | |
| tree | 79ebb3fb8b351e8347c092e62331cd50b2a06a7b /libmpcodecs | |
| parent | 3c2d6d9a8e28900300d20830c309eea2d511cfc8 (diff) | |
| parent | 0426d5d72df81217f32147d039f3eb29c009af12 (diff) | |
| download | mpv-95fba94860a02be5b50c4050f9ba2ac41daea3c2.tar.bz2 mpv-95fba94860a02be5b50c4050f9ba2ac41daea3c2.tar.xz | |
Merge svn changes up to r30917
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vd_qtvideo.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/libmpcodecs/vd_qtvideo.c b/libmpcodecs/vd_qtvideo.c index ea7aa4eaa1..18c769e32c 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"); @@ -241,7 +239,6 @@ static int init(sh_video_t *sh){ // uninit driver static void uninit(sh_video_t *sh){ - OSErr result; if(OutBufferGWorld) { DisposeGWorld(OutBufferGWorld); OutBufferGWorld = NULL; @@ -254,8 +251,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 |