[vlc-commits] Revert "Pass the value by pointer (cid #1049514)"

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Jan 19 19:29:15 2014 +0100| [761a49f8f9352ab5633cdea47900aa2b95ba6cf8] | committer: Jean-Baptiste Kempf

Revert "Pass the value by pointer (cid #1049514)"

This reverts commit e7d6279cee9d96d0b2514a5659bc21e861f5112b.

This broke zvbi decoding on Windows
Close #9523

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=761a49f8f9352ab5633cdea47900aa2b95ba6cf8
---

 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 e40f8b9..9049d3a 100644
--- a/modules/codec/zvbi.c
+++ b/modules/codec/zvbi.c
@@ -168,7 +168,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);
@@ -465,7 +465,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:
@@ -614,7 +614,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;
@@ -626,8 +626,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 )
@@ -647,7 +647,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;
             }