* ehm, added a missing test case checking if EyeTV wasn't launch prior to VLC's launc...

[vlc] / modules / video_output / caca.c

diff --git a/modules/video_output/caca.c b/modules/video_output/caca.c
index f68f4f84ee4a7eab31725821284f9c0d04f86a47..eb565dbaff26e06cbdc4bb35f774774a429f9505 100644 (file)
--- a/modules/video_output/caca.c
+++ b/modules/video_output/caca.c
@@ -24,9 +24,12 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <errno.h>                                                 /* ENOMEM */
-#include <stdlib.h>                                                /* free() */
-#include <string.h>                                            /* strerror() */
+
+#include <vlc/vlc.h>
+#include <vlc_vout.h>
+#include <vlc_interface.h>
+#include <vlc_playlist.h>
+#include <vlc_keys.h>
 
 #include <caca.h>
 
@@ -53,11 +56,6 @@
 #   define caca_set_display_title(x,y) caca_set_window_title(y)
 #endif
 
-#include <vlc/vlc.h>
-#include <vlc/vout.h>
-#include <vlc/intf.h>
-#include <vlc_keys.h>
-
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
@@ -358,7 +356,7 @@ static int Manage( vout_thread_t *p_vout )
                 playlist_Stop( p_playlist );
                 vlc_object_release( p_playlist );
             }
-            p_vout->p_libvlc->b_die = VLC_TRUE;
+            vlc_object_kill( p_vout->p_libvlc );
             break;
         }
 #endif