diff options
author | cboesch <cboesch@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-11-14 09:12:34 +0000 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-11-14 13:11:20 +0200 |
commit | fe3c4810e1c8b535caf07df8e4434e322d3e6fc0 (patch) | |
tree | cbcd859f358c479223eb7b0aa2a2d3dfe1c81b69 /libmpcodecs/vf_scale.c | |
parent | b492561241f2a3263a8ab558fafc957130dbdfc1 (diff) | |
download | mpv-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 'libmpcodecs/vf_scale.c')
-rw-r--r-- | libmpcodecs/vf_scale.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libmpcodecs/vf_scale.c b/libmpcodecs/vf_scale.c index a8d7456aba..12c51ae685 100644 --- a/libmpcodecs/vf_scale.c +++ b/libmpcodecs/vf_scale.c @@ -303,10 +303,8 @@ static int config(struct vf_instance *vf, } vf->priv->fmt=best; - if(vf->priv->palette){ - free(vf->priv->palette); - vf->priv->palette=NULL; - } + free(vf->priv->palette); + vf->priv->palette=NULL; switch(best){ case IMGFMT_RGB8: { /* set 332 palette for 8 bpp */ @@ -526,7 +524,7 @@ static int query_format(struct vf_instance *vf, unsigned int fmt){ static void uninit(struct vf_instance *vf){ if(vf->priv->ctx) sws_freeContext(vf->priv->ctx); if(vf->priv->ctx2) sws_freeContext(vf->priv->ctx2); - if(vf->priv->palette) free(vf->priv->palette); + free(vf->priv->palette); free(vf->priv); } |