summaryrefslogtreecommitdiffstats
path: root/libvo/vo_gl2.c
diff options
context:
space:
mode:
authorcboesch <cboesch@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-11-14 09:12:34 +0000
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-11-14 13:11:20 +0200
commitfe3c4810e1c8b535caf07df8e4434e322d3e6fc0 (patch)
treecbcd859f358c479223eb7b0aa2a2d3dfe1c81b69 /libvo/vo_gl2.c
parentb492561241f2a3263a8ab558fafc957130dbdfc1 (diff)
downloadmpv-fe3c4810e1c8b535caf07df8e4434e322d3e6fc0.tar.bz2
mpv-fe3c4810e1c8b535caf07df8e4434e322d3e6fc0.tar.xz
cleanup: remove NULL checks before free() all over the code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32624 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_gl2.c')
-rw-r--r--libvo/vo_gl2.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/libvo/vo_gl2.c b/libvo/vo_gl2.c
index f956fcf7d7..14137f76a6 100644
--- a/libvo/vo_gl2.c
+++ b/libvo/vo_gl2.c
@@ -236,8 +236,7 @@ static int initTextures(void)
texpercx = (GLfloat) texture_width / (GLfloat) image_width;
texpercy = (GLfloat) texture_height / (GLfloat) image_height;
- if (texgrid)
- free(texgrid);
+ free(texgrid);
texgrid = calloc (texnumx * texnumy, sizeof (struct TexSquare));
raw_line_len = image_width * image_bytes;
@@ -826,10 +825,8 @@ static void
uninit(void)
{
if ( !vo_config_count ) return;
- if (texgrid) {
- free(texgrid);
- texgrid = NULL;
- }
+ free(texgrid);
+ texgrid = NULL;
uninit_mpglcontext(&glctx);
}