X-Git-Url: http://git.videolan.org/gitweb.cgi/vlc.git/?p=vlc.git;p=vlc.git;a=blobdiff_plain;f=modules%2Fcodec%2Fsubtitles%2Fsubsusf.c;h=b03be78b8d6661ed11a0c60cb302405eb37412d3;hp=c603532009ccb017050e369a37cca1332affa07d;hb=8f83ef4b74b37d92e95fc9bcebabf67e9aeef291;hpb=692cad3b3eb855aea24675bec42c594edccccff8 diff --git a/modules/codec/subtitles/subsusf.c b/modules/codec/subtitles/subsusf.c index c603532009..b03be78b8d 100644 --- a/modules/codec/subtitles/subsusf.c +++ b/modules/codec/subtitles/subsusf.c @@ -1208,7 +1208,8 @@ static subpicture_region_t *LoadEmbeddedImage( decoder_t *p_dec, return NULL; } assert( p_pic->format.i_chroma == VLC_FOURCC('Y','U','V','A') ); - picture_CopyPixels( &p_region->picture, p_pic ); + /* FIXME the copy is probably not needed anymore */ + picture_CopyPixels( p_region->p_picture, p_pic ); /* This isn't the best way to do this - if you really want transparency, then * you're much better off using an image type that supports it like PNG. The @@ -1231,11 +1232,11 @@ static subpicture_region_t *LoadEmbeddedImage( decoder_t *p_dec, { for( unsigned int x = 0; x < p_region->fmt.i_width; x++ ) { - if( p_region->picture.Y_PIXELS[y*p_region->picture.Y_PITCH + x] != i_y || - p_region->picture.U_PIXELS[y*p_region->picture.U_PITCH + x] != i_u || - p_region->picture.V_PIXELS[y*p_region->picture.V_PITCH + x] != i_v ) + if( p_region->p_picture->Y_PIXELS[y*p_region->p_picture->Y_PITCH + x] != i_y || + p_region->p_picture->U_PIXELS[y*p_region->p_picture->U_PITCH + x] != i_u || + p_region->p_picture->V_PIXELS[y*p_region->p_picture->V_PITCH + x] != i_v ) continue; - p_region->picture.A_PIXELS[y*p_region->picture.A_PITCH + x] = 0; + p_region->p_picture->A_PIXELS[y*p_region->p_picture->A_PITCH + x] = 0; } }