diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-05-08 21:40:20 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-05-08 21:40:20 +0000 |
| commit | 2a78342333311afe2d7d46080c0b1febee357aa4 (patch) | |
| tree | bbbd06cef5ff0d899e71036d83efebdcb7166866 /libvo | |
| parent | ca4e501dc06accd4a44c69a5e289ca25d65999cd (diff) | |
| download | mpv-2a78342333311afe2d7d46080c0b1febee357aa4.tar.bz2 mpv-2a78342333311afe2d7d46080c0b1febee357aa4.tar.xz | |
fixed memory leak and removed unnecessary static variable
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12447 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/vo_gl2.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/libvo/vo_gl2.c b/libvo/vo_gl2.c index f6279cb03a..d91b9027cb 100644 --- a/libvo/vo_gl2.c +++ b/libvo/vo_gl2.c @@ -59,7 +59,6 @@ LIBVO_EXTERN(gl2) #define MODE_RGB 0 /* local data */ -static unsigned char *ImageDataLocal=NULL; static unsigned char *ImageData=NULL; /* X11 related variables */ @@ -210,10 +209,10 @@ static int initTextures() texgrid = (struct TexSquare *) calloc (texnumx * texnumy, sizeof (struct TexSquare)); - line_1 = (unsigned char *) ImageDataLocal; - line_2 = (unsigned char *) ImageDataLocal+(image_width*image_bytes); + line_1 = (unsigned char *) ImageData; + line_2 = (unsigned char *) ImageData+(image_width*image_bytes); - mem_start = (unsigned char *) ImageDataLocal; + mem_start = (unsigned char *) ImageData; raw_line_len = line_2 - line_1; @@ -810,10 +809,8 @@ static uint32_t config_glx_gui(uint32_t d_width, uint32_t d_height) { static int initGl(uint32_t d_width, uint32_t d_height) { - ImageDataLocal=malloc(image_width*image_height*image_bytes); - memset(ImageDataLocal,128,image_width*image_height*image_bytes); - - ImageData=ImageDataLocal; + ImageData=malloc(image_width*image_height*image_bytes); + memset(ImageData,128,image_width*image_height*image_bytes); texture_width=image_width; texture_height=image_height; @@ -849,6 +846,9 @@ static int initGl(uint32_t d_width, uint32_t d_height) drawTextureDisplay (); + free (ImageData); + ImageData = NULL; + mp_msg(MSGT_VO, MSGL_V, "[gl2] Using image_bpp=%d, image_bytes=%d, isBGR=%d, \n\tgl_bitmap_format=%s, gl_bitmap_type=%s, \n\tgl_alignment=%d, rgb_size=%d (%d,%d,%d), a_sz=%d, \n\tgl_internal_format=%s\n", image_bpp, image_bytes, image_mode==MODE_BGR, gl_bitmap_format_s, gl_bitmap_type_s, gl_alignment, @@ -1100,7 +1100,10 @@ static void check_events(void) #endif static void draw_osd(void) -{ vo_draw_text(image_width,image_height,draw_alpha_fnc); } +{ + if (ImageData) + vo_draw_text(image_width,image_height,draw_alpha_fnc); +} static void flip_page(void) |