X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_output%2Fsvgalib.c;h=d66bc947c9d0f8facee7bf72b134073f3924ba07;hb=b311515d35eeddd3184785291d6fe8d2643e4ac0;hp=efd62e534f2f21f840567d9a2750e354c1128203;hpb=d3fe7f28797d4dba65ffcdd60bf932e758a48a9e;p=vlc

diff --git a/modules/video_output/svgalib.c b/modules/video_output/svgalib.c
index efd62e534f..d66bc947c9 100644
--- a/modules/video_output/svgalib.c
+++ b/modules/video_output/svgalib.c
@@ -24,10 +24,15 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_vout.h>
+#include <vlc_interface.h>
 
 #include <vga.h>
 #include <vgagl.h>
@@ -49,15 +54,15 @@ static void SetPalette( vout_thread_t *, uint16_t *, uint16_t *, uint16_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-vlc_module_begin();
-    set_shortname( "SVGAlib" );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VOUT );
-    set_description( _("SVGAlib video output") );
-    set_capability( "video output", 0 );
-    set_callbacks( Create, Destroy );
-    linked_with_a_crap_library_which_uses_atexit();
-vlc_module_end();
+vlc_module_begin ()
+    set_shortname( "SVGAlib" )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VOUT )
+    set_description( N_("SVGAlib video output") )
+    set_capability( "video output", 0 )
+    set_callbacks( Create, Destroy )
+    cannot_unload_broken_library () /* SVGAlib uses atexit() */
+vlc_module_end ()
 
 /*****************************************************************************
  * vout_sys_t: video output descriptor
@@ -150,7 +155,7 @@ static int Init( vout_thread_t *p_vout )
 
     /* Initialize the output structure: RGB with square pixels, whatever
      * the input format is, since it's the only format we know */
-    p_vout->output.i_chroma = VLC_FOURCC('R','G','B','2');
+    p_vout->output.i_chroma = VLC_CODEC_RGB8;
     p_vout->output.pf_setpalette = SetPalette;
     p_vout->output.i_width = vga_getxdim();
     p_vout->output.i_height = vga_getydim();
@@ -178,7 +183,8 @@ static int Init( vout_thread_t *p_vout )
 
     vout_AllocatePicture( p_vout, p_pic, p_vout->output.i_chroma,
                           p_vout->output.i_width, p_vout->output.i_height,
-                          p_vout->output.i_aspect );
+                          p_vout->output.i_aspect * p_vout->output.i_height,
+                          VOUT_ASPECT_FACTOR      * p_vout->output.i_width );
 
     if( p_pic->i_planes == 0 )
     {
@@ -231,7 +237,7 @@ static int Manage( vout_thread_t *p_vout )
     if( keyboard_keypressed(SCANCODE_ESCAPE)
          || keyboard_keypressed(SCANCODE_Q ) )
     {
-        p_vout->p_libvlc->b_die = VLC_TRUE;
+        libvlc_Quit( p_vout->p_libvlc );
     }
 
     return VLC_SUCCESS;