summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-10-03 21:42:31 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-10-03 21:42:31 +0000
commite3e81503aa9d9f9b7b5bd3fb93a9c0147df43859 (patch)
tree147a709088d409cc22bb6dbb0c8525bc2d02437b /libvo
parent8b3593e9bf7e314d3c77be92c3cc7c6901318751 (diff)
downloadmpv-e3e81503aa9d9f9b7b5bd3fb93a9c0147df43859.tar.bz2
mpv-e3e81503aa9d9f9b7b5bd3fb93a9c0147df43859.tar.xz
fixed memleak, especially for fixed-vo.
Based on a patch by beastd (eclipse7 (at) gmx (dot) net). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13541 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/vo_gl2.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/libvo/vo_gl2.c b/libvo/vo_gl2.c
index b116a5425a..b05d00b1d4 100644
--- a/libvo/vo_gl2.c
+++ b/libvo/vo_gl2.c
@@ -88,7 +88,7 @@ static uint32_t texture_width;
static uint32_t texture_height;
static int texnumx, texnumy, raw_line_len;
static GLfloat texpercx, texpercy;
-static struct TexSquare * texgrid;
+static struct TexSquare * texgrid = NULL;
static GLint gl_internal_format;
static char * gl_internal_format_s;
static int rgb_sz, r_sz, g_sz, b_sz, a_sz;
@@ -212,6 +212,8 @@ static int initTextures()
if (texpercy > 1.0)
texpercy = 1.0;
+ if (texgrid)
+ free(texgrid);
texgrid = (struct TexSquare *)
calloc (texnumx * texnumy, sizeof (struct TexSquare));
@@ -1176,6 +1178,10 @@ static void
uninit(void)
{
if ( !vo_config_count ) return;
+ if (texgrid) {
+ free(texgrid);
+ texgrid = NULL;
+ }
#ifdef GL_WIN32
vo_w32_uninit();
#else