X-Git-Url: http://git.videolan.org/gitweb.cgi/vlc.git/?p=vlc.git;p=vlc.git;a=blobdiff_plain;f=src%2Fosd%2Fosd_widgets.c;h=2d384d1b4cd3f4a16ba1983c77acc7f2d832d3c3;hp=5d8fafd988c75c5ae827aca0cbaa7a5a3992e744;hb=8f83ef4b74b37d92e95fc9bcebabf67e9aeef291;hpb=692cad3b3eb855aea24675bec42c594edccccff8 diff --git a/src/osd/osd_widgets.c b/src/osd/osd_widgets.c index 5d8fafd988..2d384d1b4c 100644 --- a/src/osd/osd_widgets.c +++ b/src/osd/osd_widgets.c @@ -52,8 +52,8 @@ static void DrawRect( subpicture_t *p_subpic, int i_x1, int i_y1, int i_x2, int i_y2, short fill ) { int x, y; - uint8_t *p_a = p_subpic->p_region->picture.A_PIXELS; - int i_pitch = p_subpic->p_region->picture.Y_PITCH; + uint8_t *p_a = p_subpic->p_region->p_picture->A_PIXELS; + int i_pitch = p_subpic->p_region->p_picture->Y_PITCH; if( fill == STYLE_FILLED ) { @@ -88,8 +88,8 @@ static void DrawTriangle( subpicture_t *p_subpic, int i_x1, int i_y1, int i_x2, int i_y2, short fill ) { int x, y, i_mid, h; - uint8_t *p_a = p_subpic->p_region->picture.A_PIXELS; - int i_pitch = p_subpic->p_region->picture.Y_PITCH; + uint8_t *p_a = p_subpic->p_region->p_picture->A_PIXELS; + int i_pitch = p_subpic->p_region->p_picture->Y_PITCH; i_mid = i_y1 + ( ( i_y2 - i_y1 ) >> 1 ); @@ -173,11 +173,11 @@ static int CreatePicture( spu_t *p_spu, subpicture_t *p_subpic, p_subpic->p_region->i_x = i_x; p_subpic->p_region->i_y = i_y; - p_y = p_subpic->p_region->picture.Y_PIXELS; - p_u = p_subpic->p_region->picture.U_PIXELS; - p_v = p_subpic->p_region->picture.V_PIXELS; - p_a = p_subpic->p_region->picture.A_PIXELS; - i_pitch = p_subpic->p_region->picture.Y_PITCH; + p_y = p_subpic->p_region->p_picture->Y_PIXELS; + p_u = p_subpic->p_region->p_picture->U_PIXELS; + p_v = p_subpic->p_region->p_picture->V_PIXELS; + p_a = p_subpic->p_region->p_picture->A_PIXELS; + i_pitch = p_subpic->p_region->p_picture->Y_PITCH; /* Initialize the region pixels (only the alpha will be changed later) */ memset( p_y, 0xff, i_pitch * p_subpic->p_region->fmt.i_height ); @@ -328,8 +328,8 @@ int osd_Icon( vlc_object_t *p_this, spu_t *p_spu, STYLE_FILLED ); if( i_type == OSD_MUTE_ICON ) { - uint8_t *p_a = p_subpic->p_region->picture.A_PIXELS; - int i_pitch = p_subpic->p_region->picture.Y_PITCH; + uint8_t *p_a = p_subpic->p_region->p_picture->A_PIXELS; + int i_pitch = p_subpic->p_region->p_picture->Y_PITCH; int i; for( i = 1; i < i_pitch; i++ ) {