diff options
| author | eugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-02-29 17:25:41 +0000 |
|---|---|---|
| committer | eugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-02-29 17:25:41 +0000 |
| commit | 579e353b0f05fe90d6c9ba2353aeae3c2acfb2bf (patch) | |
| tree | ed751dfac95eb34a5cc0869971992ec3c99f39c8 /libmpdemux/demuxer.c | |
| parent | a2fad60c7f92299aa3cf51c85e0491167287c517 (diff) | |
| download | mpv-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/demuxer.c')
| -rw-r--r-- | libmpdemux/demuxer.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 35cf4dc294..28388bb192 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -251,7 +251,7 @@ sh_sub_t *new_sh_sub_sid(demuxer_t *demuxer, int id, int sid) { void free_sh_sub(sh_sub_t *sh) { mp_msg(MSGT_DEMUXER, MSGL_DBG2, "DEMUXER: freeing sh_sub at %p\n", sh); - if (sh->extradata) free(sh->extradata); + free(sh->extradata); #ifdef USE_ASS if (sh->ass_track) ass_free_track(sh->ass_track); #endif @@ -288,8 +288,8 @@ void free_sh_audio(demuxer_t *demuxer, int id) { sh_audio_t *sh = demuxer->a_streams[id]; demuxer->a_streams[id] = NULL; mp_msg(MSGT_DEMUXER,MSGL_DBG2,"DEMUXER: freeing sh_audio at %p\n",sh); - if(sh->wf) free(sh->wf); - if(sh->codecdata) free(sh->codecdata); + free(sh->wf); + free(sh->codecdata); free(sh->lang); free(sh); } @@ -314,7 +314,7 @@ sh_video_t* new_sh_video_vid(demuxer_t *demuxer,int id,int vid){ void free_sh_video(sh_video_t* sh){ mp_msg(MSGT_DEMUXER,MSGL_DBG2,"DEMUXER: freeing sh_video at %p\n",sh); - if(sh->bih) free(sh->bih); + free(sh->bih); free(sh); } @@ -343,12 +343,10 @@ skip_streamfree: free(demuxer->info[i]); free(demuxer->info); } - if(demuxer->filename) - free(demuxer->filename); + free(demuxer->filename); if (demuxer->chapters) { for (i=0; i<demuxer->num_chapters; i++) - if (demuxer->chapters[i].name) - free(demuxer->chapters[i].name); + free(demuxer->chapters[i].name); free(demuxer->chapters); } if (demuxer->attachments) { |