From: Pierre Baillet <octplane@videolan.org>
Date: Thu, 30 Nov 2000 17:37:23 +0000 (+0000)
Subject: . Fixed a segfault
X-Git-Tag: 0.2.70~347
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=b207b8f82ed70889a405bcfd5430ebb0bfeae751;p=vlc

. Fixed a segfault
. Fixed a SDL API change about clipping (?).
---

diff --git a/plugins/sdl/vout_sdl.c b/plugins/sdl/vout_sdl.c
index 6ad7dcfddd..24a0f38365 100644
--- a/plugins/sdl/vout_sdl.c
+++ b/plugins/sdl/vout_sdl.c
@@ -120,7 +120,6 @@ void vout_SDLEnd( vout_thread_t *p_vout )
     {
         SDL_UnlockSurface ( p_vout->p_sys->p_display );
     }
-    free( p_vout->p_sys );
 }
 
 /*****************************************************************************
@@ -194,7 +193,6 @@ void vout_SDLDisplay( vout_thread_t *p_vout )
  *****************************************************************************/
 static int SDLOpenDisplay( vout_thread_t *p_vout, char *psz_display, void *p_data )
 {
-    SDL_Rect    clipping_rect;
     
     /* Initialize library */
     if( SDL_Init(SDL_INIT_VIDEO) < 0 )
@@ -258,11 +256,9 @@ static int SDLOpenDisplay( vout_thread_t *p_vout, char *psz_display, void *p_dat
 */
 		
     /* Set clipping for text */
-    clipping_rect.x = 0;
-    clipping_rect.y = 0;
-    clipping_rect.w = p_vout->p_sys->p_display->w;
-    clipping_rect.h = p_vout->p_sys->p_display->h;
-    SDL_SetClipRect(p_vout->p_sys->p_display, &clipping_rect);
+    SDL_SetClipping(p_vout->p_sys->p_display, 0, 0, 
+                    p_vout->p_sys->p_display->w,
+                    p_vout->p_sys->p_display->h);