summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/dec_teletext.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 /libmpcodecs/dec_teletext.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 'libmpcodecs/dec_teletext.c')
-rw-r--r--libmpcodecs/dec_teletext.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/libmpcodecs/dec_teletext.c b/libmpcodecs/dec_teletext.c
index 215246af89..d619ecde80 100644
--- a/libmpcodecs/dec_teletext.c
+++ b/libmpcodecs/dec_teletext.c
@@ -1100,8 +1100,7 @@ static int decode_pkt0(priv_vbi_t* priv,unsigned char* data,int magAddr)
if(d[i]&0x80){
pll_add(priv,2,4);
- if(priv->mag[magAddr].pt)
- free(priv->mag[magAddr].pt);
+ free(priv->mag[magAddr].pt);
priv->mag[magAddr].pt=NULL;
priv->mag[magAddr].order=0;
return 0;
@@ -1753,10 +1752,8 @@ int teletext_control(void* p, int cmd, void *arg)
}
case TV_VBI_CONTROL_STOP:
{
- if(priv->mag)
- free(priv->mag);
- if(priv->ptsp)
- free(priv->ptsp);
+ free(priv->mag);
+ free(priv->ptsp);
destroy_cache(priv);
priv->page_changed=1;
pthread_mutex_destroy(&priv->buffer_mutex);