[MPlayer-cvslog] r30656 - in trunk/libmpcodecs: ad_qtaudio.c vd_qtvideo.c

[komh]

Author: komh
Date: Fri Feb 19 14:50:16 2010
New Revision: 30656

Log:
Fix the stack crash(SYS3171) on OS/2 when playing qtaudio/qtvideo.

Modified:
   trunk/libmpcodecs/ad_qtaudio.c
   trunk/libmpcodecs/vd_qtvideo.c

Modified: trunk/libmpcodecs/ad_qtaudio.c
==============================================================================
--- trunk/libmpcodecs/ad_qtaudio.c	Fri Feb 19 14:40:04 2010	(r30655)
+++ trunk/libmpcodecs/ad_qtaudio.c	Fri Feb 19 14:50:16 2010	(r30656)
@@ -277,6 +277,11 @@ static void uninit(sh_audio_t *sh){
     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 @@ static int decode_audio(sh_audio_t *sh,u
     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;

Modified: trunk/libmpcodecs/vd_qtvideo.c
==============================================================================
--- trunk/libmpcodecs/vd_qtvideo.c	Fri Feb 19 14:40:04 2010	(r30655)
+++ trunk/libmpcodecs/vd_qtvideo.c	Fri Feb 19 14:50:16 2010	(r30656)
@@ -316,6 +316,10 @@ static mp_image_t* decode(sh_video_t *sh
 	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;