mirror of https://github.com/mpv-player/mpv
Fix the stack crash(SYS3171) on OS/2 when playing qtaudio/qtvideo.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30656 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
c9cf9649cf
commit
0599ce10ab
|
@ -277,6 +277,11 @@ static void uninit(sh_audio_t *sh){
|
||||||
int error;
|
int error;
|
||||||
unsigned long ConvertedFrames=0;
|
unsigned long ConvertedFrames=0;
|
||||||
unsigned long ConvertedBytes=0;
|
unsigned long ConvertedBytes=0;
|
||||||
|
|
||||||
|
#ifdef WIN32_LOADER
|
||||||
|
Setup_FS_Segment();
|
||||||
|
#endif
|
||||||
|
|
||||||
error=SoundConverterEndConversion(myConverter,NULL,&ConvertedFrames,&ConvertedBytes);
|
error=SoundConverterEndConversion(myConverter,NULL,&ConvertedFrames,&ConvertedBytes);
|
||||||
mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"SoundConverterEndConversion:%i\n",error);
|
mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"SoundConverterEndConversion:%i\n",error);
|
||||||
error = SoundConverterClose(myConverter);
|
error = SoundConverterClose(myConverter);
|
||||||
|
@ -300,6 +305,10 @@ static int decode_audio(sh_audio_t *sh,unsigned char *buf,int minlen,int maxlen)
|
||||||
unsigned long ConvertedFrames=0;
|
unsigned long ConvertedFrames=0;
|
||||||
unsigned long ConvertedBytes=0;
|
unsigned long ConvertedBytes=0;
|
||||||
|
|
||||||
|
#ifdef WIN32_LOADER
|
||||||
|
Setup_FS_Segment();
|
||||||
|
#endif
|
||||||
|
|
||||||
FramesToGet=minlen/OutFrameSize;
|
FramesToGet=minlen/OutFrameSize;
|
||||||
if(FramesToGet*OutFrameSize<minlen &&
|
if(FramesToGet*OutFrameSize<minlen &&
|
||||||
(FramesToGet+1)*OutFrameSize<=maxlen) ++FramesToGet;
|
(FramesToGet+1)*OutFrameSize<=maxlen) ++FramesToGet;
|
||||||
|
|
|
@ -316,6 +316,10 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){
|
||||||
sh->disp_w, sh->disp_h);
|
sh->disp_w, sh->disp_h);
|
||||||
if(!mpi) return NULL;
|
if(!mpi) return NULL;
|
||||||
|
|
||||||
|
#ifdef WIN32_LOADER
|
||||||
|
Setup_FS_Segment();
|
||||||
|
#endif
|
||||||
|
|
||||||
decpar.data = (char*)data;
|
decpar.data = (char*)data;
|
||||||
decpar.bufferSize = len;
|
decpar.bufferSize = len;
|
||||||
(**framedescHandle).dataSize=len;
|
(**framedescHandle).dataSize=len;
|
||||||
|
|
Loading…
Reference in New Issue