diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-10-13 18:38:50 +0000 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-11-02 04:18:37 +0200 |
| commit | b9ab864eecc5ec19c1716db4e5015979bc197c9e (patch) | |
| tree | ced83c03c095ed31ac6e58709a6a2884c0a5a4f3 | |
| parent | 79347eaedb9a3d36ddce56148e911f572b12becf (diff) | |
| download | mpv-b9ab864eecc5ec19c1716db4e5015979bc197c9e.tar.bz2 mpv-b9ab864eecc5ec19c1716db4e5015979bc197c9e.tar.xz | |
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
| -rw-r--r-- | libmpcodecs/vd_qtvideo.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 |