From b9ab864eecc5ec19c1716db4e5015979bc197c9e Mon Sep 17 00:00:00 2001 From: reimar Date: Wed, 13 Oct 2010 18:38:50 +0000 Subject: vd_qtvideo: fix crash on OS X with QuickTime 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. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32486 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/vd_qtvideo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libmpcodecs/vd_qtvideo.c b/libmpcodecs/vd_qtvideo.c index 1847291b0b..e18a88a259 100644 --- a/libmpcodecs/vd_qtvideo.c +++ b/libmpcodecs/vd_qtvideo.c @@ -274,7 +274,7 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ if(len<=0) return NULL; // skipped frame -#ifdef WIN32_LOADER +#if defined(WIN32_LOADER) && !defined(CONFIG_QUICKTIME) Setup_FS_Segment(); #endif -- cgit v1.2.3