[vlc-commits] commit: Fixed a segfault with osdmenu filter. (Laurent Aimar )

git at videolan.org git at videolan.org
Sat May 1 13:42:29 CEST 2010


vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sat May  1 00:32:20 2010 +0200| [5d51dfe0711b6c1539e39fe43995875a4eff3f78] | committer: Laurent Aimar 

Fixed a segfault with osdmenu filter.

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

 modules/video_filter/osdmenu.c |   15 +--------------
 1 files changed, 1 insertions(+), 14 deletions(-)

diff --git a/modules/video_filter/osdmenu.c b/modules/video_filter/osdmenu.c
index b9f9807..1b2c47b 100644
--- a/modules/video_filter/osdmenu.c
+++ b/modules/video_filter/osdmenu.c
@@ -480,21 +480,8 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t i_date )
      * when OSD menu should be hidden and menu picture is not allocated.
      */
     if( !p_filter->p_sys->p_menu->p_state->p_pic ||
-        ( p_filter->p_sys->b_visible == false ) )
+        !p_filter->p_sys->b_visible )
     {
-        /* Create new spu regions and allocate an empty picture in it. */
-        p_region = create_picture_region( p_filter, p_spu,
-            p_filter->p_sys->p_menu->p_state->i_width,
-            p_filter->p_sys->p_menu->p_state->i_height,
-            NULL );
-
-        /* proper positioning of OSD menu image */
-        p_region->i_x = p_filter->p_sys->p_menu->p_state->i_x;
-        p_region->i_y = p_filter->p_sys->p_menu->p_state->i_y;
-        /* FIXME is it needed ?
-        p_region->i_align = p_sys->i_position;
-        */
-        p_spu->p_region = p_region;
         p_spu->i_alpha = 0xFF; /* Picture is completely non transparent. */
         return p_spu;
     }



More information about the vlc-commits mailing list