set_category( CAT_VIDEO )
set_subcategory( SUBCAT_VIDEO_SUBPIC )
- add_integer( "win32text-fontsize", 0, NULL, FONTSIZE_TEXT,
+ add_integer( "win32text-fontsize", 0, FONTSIZE_TEXT,
FONTSIZE_LONGTEXT, true )
/* opacity valid on 0..255, with default 255 = fully opaque */
OPACITY_TEXT, OPACITY_LONGTEXT, false )
/* hook to the color values list, with default 0x00ffffff = white */
- add_integer( "win32text-color", 0x00FFFFFF, NULL, COLOR_TEXT,
+ add_integer( "win32text-color", 0x00FFFFFF, COLOR_TEXT,
COLOR_LONGTEXT, true )
- change_integer_list( pi_color_values, ppsz_color_descriptions, NULL );
+ change_integer_list( pi_color_values, ppsz_color_descriptions )
- add_integer( "win32text-rel-fontsize", 16, NULL, FONTSIZER_TEXT,
+ add_integer( "win32text-rel-fontsize", 16, FONTSIZER_TEXT,
FONTSIZER_LONGTEXT, false )
- change_integer_list( pi_sizes, ppsz_sizes_text, NULL );
+ change_integer_list( pi_sizes, ppsz_sizes_text )
set_capability( "text renderer", 50 )
add_shortcut( "text" )
fmt.p_palette->palette[i][3] = pi_gamma[i];
}
- p_region->p_picture = picture_New( fmt.i_chroma, fmt.i_width, fmt.i_height, fmt.i_aspect );
+ p_region->p_picture = picture_NewFromFormat( &fmt );
if( !p_region->p_picture )
{
free( fmt.p_palette );
/* Sanity check */
if( !p_region_in || !p_region_out ) return VLC_EGENERIC;
+ if( !p_region_in->psz_text || !*p_region_in->psz_text )
+ return VLC_EGENERIC;
+
psz_string = malloc( (strlen( p_region_in->psz_text )+1) * sizeof(TCHAR) );
if( !psz_string )
return VLC_ENOMEM;