Commit 82abb301 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont
Browse files

Revert "vlc: Make sure we call libvlc_release() when we are requested to die."

This reverts commit 68bcb6a4.

As pointed by courmisch, this is crashy.

Conflicts:

	src/vlc.c
parent 42255fd0
...@@ -56,9 +56,6 @@ extern void __wgetmainargs(int *argc, wchar_t ***wargv, wchar_t ***wenviron, ...@@ -56,9 +56,6 @@ extern void __wgetmainargs(int *argc, wchar_t ***wargv, wchar_t ***wenviron,
static void *SigHandler (void *set); static void *SigHandler (void *set);
#endif #endif
/* running vlc instance */
static libvlc_instance_t * vlc = NULL;
/***************************************************************************** /*****************************************************************************
* main: parse command line, start interface and spawn threads. * main: parse command line, start interface and spawn threads.
*****************************************************************************/ *****************************************************************************/
...@@ -187,7 +184,7 @@ int main( int i_argc, const char *ppsz_argv[] ) ...@@ -187,7 +184,7 @@ int main( int i_argc, const char *ppsz_argv[] )
libvlc_exception_init (&ex); libvlc_exception_init (&ex);
/* Initialize libvlc */ /* Initialize libvlc */
vlc = libvlc_new (i_argc, ppsz_argv, &ex); libvlc_instance_t *vlc = libvlc_new (i_argc, ppsz_argv, &ex);
if (vlc != NULL) if (vlc != NULL)
{ {
libvlc_run_interface (vlc, NULL, &ex); libvlc_run_interface (vlc, NULL, &ex);
...@@ -255,7 +252,7 @@ static void *SigHandler (void *data) ...@@ -255,7 +252,7 @@ static void *SigHandler (void *data)
fprintf (stderr, "signal %d received, terminating vlc - do it " fprintf (stderr, "signal %d received, terminating vlc - do it "
"again quickly in case it gets stuck\n", i_signal); "again quickly in case it gets stuck\n", i_signal);
if (vlc) libvlc_release (vlc); //VLC_Die( 0 );
} }
else /* time (NULL) <= abort_time */ else /* time (NULL) <= abort_time */
{ {
......
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