summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_mkv.c
diff options
context:
space:
mode:
authoreugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-02-29 17:25:41 +0000
committereugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-02-29 17:25:41 +0000
commit579e353b0f05fe90d6c9ba2353aeae3c2acfb2bf (patch)
treeed751dfac95eb34a5cc0869971992ec3c99f39c8 /libmpdemux/demux_mkv.c
parenta2fad60c7f92299aa3cf51c85e0491167287c517 (diff)
downloadmpv-579e353b0f05fe90d6c9ba2353aeae3c2acfb2bf.tar.bz2
mpv-579e353b0f05fe90d6c9ba2353aeae3c2acfb2bf.tar.xz
Remove stupid checks of free() argument.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26117 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_mkv.c')
-rw-r--r--libmpdemux/demux_mkv.c30
1 files changed, 10 insertions, 20 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c
index 2a124ba902..6081fb8adb 100644
--- a/libmpdemux/demux_mkv.c
+++ b/libmpdemux/demux_mkv.c
@@ -927,18 +927,12 @@ demux_mkv_read_trackvideo (demuxer_t *demuxer, mkv_track_t *track)
*/
static void
demux_mkv_free_trackentry(mkv_track_t *track) {
- if (track->name)
- free (track->name);
- if (track->codec_id)
- free (track->codec_id);
- if (track->language)
- free (track->language);
- if (track->private_data)
- free (track->private_data);
- if (track->audio_buf)
- free (track->audio_buf);
- if (track->audio_timestamp)
- free (track->audio_timestamp);
+ free (track->name);
+ free (track->codec_id);
+ free (track->language);
+ free (track->private_data);
+ free (track->audio_buf);
+ free (track->audio_timestamp);
demux_mkv_free_encodings(track->encodings, track->num_encodings);
free(track);
}
@@ -2545,14 +2539,10 @@ demux_close_mkv (demuxer_t *demuxer)
demux_mkv_free_trackentry(mkv_d->tracks[i]);
free (mkv_d->tracks);
}
- if (mkv_d->indexes)
- free (mkv_d->indexes);
- if (mkv_d->cluster_positions)
- free (mkv_d->cluster_positions);
- if (mkv_d->parsed_cues)
- free (mkv_d->parsed_cues);
- if (mkv_d->parsed_seekhead)
- free (mkv_d->parsed_seekhead);
+ free (mkv_d->indexes);
+ free (mkv_d->cluster_positions);
+ free (mkv_d->parsed_cues);
+ free (mkv_d->parsed_seekhead);
free (mkv_d);
}
}