[vlc-commits] Pass the value by pointer (cid #1049514)
Rémi Duraffort
git at videolan.org
Sat Jul 20 11:52:40 CEST 2013
vlc/vlc-2.1 | branch: master | Rémi Duraffort <ivoire at videolan.org> | Fri Jul 19 21:47:28 2013 +0200| [bec3a2b0e39be32b2d7c7894d871c3a1f1e7c4e5] | committer: Jean-Baptiste Kempf
Pass the value by pointer (cid #1049514)
(cherry picked from commit e7d6279cee9d96d0b2514a5659bc21e861f5112b)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=bec3a2b0e39be32b2d7c7894d871c3a1f1e7c4e5
---
modules/codec/zvbi.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/modules/codec/zvbi.c b/modules/codec/zvbi.c
index 62862ce..ccae4e8 100644
--- a/modules/codec/zvbi.c
+++ b/modules/codec/zvbi.c
@@ -182,7 +182,7 @@ static subpicture_t *Subpicture( decoder_t *p_dec, video_format_t *p_fmt,
int i_align, mtime_t i_pts );
static void EventHandler( vbi_event *ev, void *user_data );
-static int OpaquePage( picture_t *p_src, const vbi_page p_page,
+static int OpaquePage( picture_t *p_src, const vbi_page *p_page,
const video_format_t fmt, bool b_opaque, const int text_offset );
static int get_first_visible_row( vbi_char *p_text, int rows, int columns);
static int get_last_visible_row( vbi_char *p_text, int rows, int columns);
@@ -462,7 +462,7 @@ static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block )
memcpy( p_sys->nav_link, &p_page.nav_link, sizeof( p_sys->nav_link )) ;
vlc_mutex_unlock( &p_sys->lock );
- OpaquePage( p_pic, p_page, fmt, b_opaque, i_first_row * p_page.columns );
+ OpaquePage( p_pic, &p_page, fmt, b_opaque, i_first_row * p_page.columns );
}
exit:
@@ -610,7 +610,7 @@ static int get_last_visible_row( vbi_char *p_text, int rows, int columns)
return 0;
}
-static int OpaquePage( picture_t *p_src, const vbi_page p_page,
+static int OpaquePage( picture_t *p_src, const vbi_page *p_page,
const video_format_t fmt, bool b_opaque, const int text_offset )
{
unsigned int x, y;
@@ -622,8 +622,8 @@ static int OpaquePage( picture_t *p_src, const vbi_page p_page,
{
for( x = 0; x < fmt.i_width; x++ )
{
- const vbi_opacity opacity = p_page.text[ text_offset + y/10 * p_page.columns + x/12 ].opacity;
- const int background = p_page.text[ text_offset + y/10 * p_page.columns + x/12 ].background;
+ const vbi_opacity opacity = p_page->text[ text_offset + y/10 * p_page->columns + x/12 ].opacity;
+ const int background = p_page->text[ text_offset + y/10 * p_page->columns + x/12 ].background;
uint32_t *p_pixel = (uint32_t*)&p_src->p->p_pixels[y * p_src->p->i_pitch + 4*x];
switch( opacity )
@@ -643,7 +643,7 @@ static int OpaquePage( picture_t *p_src, const vbi_page p_page,
break;
/* Full text transparency. only foreground color is show */
case VBI_TRANSPARENT_FULL:
- if( (*p_pixel) == (0xff000000 | p_page.color_map[background] ) )
+ if( (*p_pixel) == (0xff000000 | p_page->color_map[background] ) )
*p_pixel = 0;
break;
}
More information about the vlc-commits
mailing list