/*****************************************************************************
* 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>
/*****************************************************************************
* 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
/* 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();
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 )
{
if( keyboard_keypressed(SCANCODE_ESCAPE)
|| keyboard_keypressed(SCANCODE_Q ) )
{
- vlc_object_kill( p_vout->p_libvlc );
+ libvlc_Quit( p_vout->p_libvlc );
}
return VLC_SUCCESS;