Commit 998798c4 authored by Sam Hocevar's avatar Sam Hocevar

* ./modules/video_output/sdl.c: avoid crashes at exit due to SDL being

    linked with svgalib and svgalib using atexit().
parent c19154da
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* sdl.c: SDL video output display method * sdl.c: SDL video output display method
***************************************************************************** *****************************************************************************
* Copyright (C) 1998-2001 VideoLAN * Copyright (C) 1998-2001 VideoLAN
* $Id: sdl.c,v 1.11 2003/03/30 18:14:38 gbazin Exp $ * $Id: sdl.c,v 1.12 2003/05/04 12:40:58 sam Exp $
* *
* Authors: Samuel Hocevar <sam@zoy.org> * Authors: Samuel Hocevar <sam@zoy.org>
* Pierre Baillet <oct@zoy.org> * Pierre Baillet <oct@zoy.org>
...@@ -109,6 +109,10 @@ vlc_module_begin(); ...@@ -109,6 +109,10 @@ vlc_module_begin();
set_callbacks( Open, Close ); set_callbacks( Open, Close );
/* XXX: check for conflicts with the SDL audio output */ /* XXX: check for conflicts with the SDL audio output */
var_Create( p_module->p_libvlc, "sdl", VLC_VAR_MUTEX ); var_Create( p_module->p_libvlc, "sdl", VLC_VAR_MUTEX );
#if defined( __i386__ )
/* On i386, SDL is linked against svgalib */
linked_with_a_crap_library_which_uses_atexit();
#endif
vlc_module_end(); vlc_module_end();
/***************************************************************************** /*****************************************************************************
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment