[MPlayer-cvslog] r32486 - trunk/libmpcodecs/vd_qtvideo.c
reimar
subversion at mplayerhq.hu
Wed Oct 13 20:38:50 CEST 2010
Author: reimar
Date: Wed Oct 13 20:38:50 2010
New Revision: 32486
Log:
Do not call Setup_FS_Segment if the QuickTime framework is used on OSX
for decoding, even if the loader code is compiled in.
There is no point in it and since Setup_LDT_Keeper is not called before
it will actually crash on OSX due to the auto-alloc functionality not
being initialized and thus it will try to set fs to 0xffffffff.
Modified:
trunk/libmpcodecs/vd_qtvideo.c
Modified: trunk/libmpcodecs/vd_qtvideo.c
==============================================================================
--- trunk/libmpcodecs/vd_qtvideo.c Wed Oct 13 17:09:24 2010 (r32485)
+++ trunk/libmpcodecs/vd_qtvideo.c Wed Oct 13 20:38:50 2010 (r32486)
@@ -274,7 +274,7 @@ static mp_image_t* decode(sh_video_t *sh
if(len<=0) return NULL; // skipped frame
-#ifdef WIN32_LOADER
+#if defined(WIN32_LOADER) && !defined(CONFIG_QUICKTIME)
Setup_FS_Segment();
#endif
More information about the MPlayer-cvslog
mailing list