Mercurial > mplayer.hg
changeset 30614:ed516abd6137
Fix the stack crash(SYS3171) on OS/2 when playing qtaudio/qtvideo.
| author | komh |
|---|---|
| date | Fri, 19 Feb 2010 13:50:16 +0000 |
| parents | e04602bd557a |
| children | 01c447d8cc30 |
| files | libmpcodecs/ad_qtaudio.c libmpcodecs/vd_qtvideo.c |
| diffstat | 2 files changed, 13 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpcodecs/ad_qtaudio.c Fri Feb 19 13:40:04 2010 +0000 +++ b/libmpcodecs/ad_qtaudio.c Fri Feb 19 13:50:16 2010 +0000 @@ -277,6 +277,11 @@ int error; unsigned long ConvertedFrames=0; unsigned long ConvertedBytes=0; + +#ifdef WIN32_LOADER + Setup_FS_Segment(); +#endif + error=SoundConverterEndConversion(myConverter,NULL,&ConvertedFrames,&ConvertedBytes); mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"SoundConverterEndConversion:%i\n",error); error = SoundConverterClose(myConverter); @@ -300,6 +305,10 @@ unsigned long ConvertedFrames=0; unsigned long ConvertedBytes=0; +#ifdef WIN32_LOADER + Setup_FS_Segment(); +#endif + FramesToGet=minlen/OutFrameSize; if(FramesToGet*OutFrameSize<minlen && (FramesToGet+1)*OutFrameSize<=maxlen) ++FramesToGet;
--- a/libmpcodecs/vd_qtvideo.c Fri Feb 19 13:40:04 2010 +0000 +++ b/libmpcodecs/vd_qtvideo.c Fri Feb 19 13:50:16 2010 +0000 @@ -316,6 +316,10 @@ sh->disp_w, sh->disp_h); if(!mpi) return NULL; +#ifdef WIN32_LOADER + Setup_FS_Segment(); +#endif + decpar.data = (char*)data; decpar.bufferSize = len; (**framedescHandle).dataSize=len;