summaryrefslogtreecommitdiffstats
path: root/sub_cc.c
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-11-07 12:47:40 +0000
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-11-08 18:05:12 +0200
commit12d3e0df9980822282f70dffad148b729dbee541 (patch)
treed298b2c8f5039eae7aeeb16dfd927bea0efcc134 /sub_cc.c
parentaf4b23cd36cff0dc34cde59c6a154fd080d11216 (diff)
downloadmpv-12d3e0df9980822282f70dffad148b729dbee541.tar.bz2
mpv-12d3e0df9980822282f70dffad148b729dbee541.tar.xz
cleanup: don't check for NULL before free()
patch by Clément Bœsch, ubitux gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32598 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'sub_cc.c')
-rw-r--r--sub_cc.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/sub_cc.c b/sub_cc.c
index 51959e029a..437b1f6d1f 100644
--- a/sub_cc.c
+++ b/sub_cc.c
@@ -81,7 +81,10 @@ static void clear_buffer(subtitle *buf)
{
int i;
buf->lines=0;
- for(i=0;i<SUB_MAX_TEXT;i++) if(buf->text[i]) {free(buf->text[i]);buf->text[i]=NULL;}
+ for (i = 0; i < SUB_MAX_TEXT; i++) {
+ free(buf->text[i]);
+ buf->text[i] = NULL;
+ }
}
@@ -95,7 +98,7 @@ static void scroll_buffer(subtitle* buf)
while(buf->lines > cc_lines)
{
- if(buf->text[0]) free(buf->text[0]);
+ free(buf->text[0]);
for(i = 0; i < (buf->lines - 1); i++) buf->text[i] = buf->text[i+1];