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 /libvo/vo_zr.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 'libvo/vo_zr.c')
| -rw-r--r-- | libvo/vo_zr.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libvo/vo_zr.c b/libvo/vo_zr.c index 8ad201a877..4cb1ed0de6 100644 --- a/libvo/vo_zr.c +++ b/libvo/vo_zr.c @@ -265,10 +265,8 @@ int init_zoran(zr_info_t *zr, int stretchx, int stretchy) { } void uninit_zoran(zr_info_t *zr) { - if (zr->image) { - free(zr->image); - zr->image=NULL; - } + free(zr->image); + zr->image=NULL; while (zr->queue > zr->synco + 1) { if (ioctl(zr->vdes, MJPIOC_SYNC, &zr->zs) < 0) mp_msg(MSGT_VO, MSGL_ERR, "zr: error waiting for buffers to become free\n"); @@ -796,8 +794,7 @@ void vo_zr_revertoption(const m_option_t* opt,const char* param) { zr_parsing = 0; if (!strcasecmp(param, "zrdev")) { - if(zr->device) - free(zr->device); + free(zr->device); zr->device=NULL; } else if (!strcasecmp(param, "zrbw")) zr->bw=0; |