summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/asfheader.c4
-rw-r--r--libmpdemux/demux_aac.c3
-rw-r--r--libmpdemux/demux_asf.c8
-rw-r--r--libmpdemux/demux_audio.c2
-rw-r--r--libmpdemux/demux_film.c3
-rw-r--r--libmpdemux/demux_fli.c7
-rw-r--r--libmpdemux/demux_mf.c2
-rw-r--r--libmpdemux/demux_mng.c3
-rw-r--r--libmpdemux/demux_mpc.c2
-rw-r--r--libmpdemux/demux_mpg.c2
-rw-r--r--libmpdemux/demux_nsv.c2
-rw-r--r--libmpdemux/demux_ogg.c13
-rw-r--r--libmpdemux/demux_pva.c7
-rw-r--r--libmpdemux/demux_real.c12
-rw-r--r--libmpdemux/demux_realaud.c8
-rw-r--r--libmpdemux/demux_roq.c2
-rw-r--r--libmpdemux/demux_rtp_codec.cpp2
-rw-r--r--libmpdemux/demux_ts.c12
-rw-r--r--libmpdemux/demux_viv.c21
-rw-r--r--libmpdemux/demuxer.h4
20 files changed, 38 insertions, 81 deletions
diff --git a/libmpdemux/asfheader.c b/libmpdemux/asfheader.c
index 033d065606..1db6eef1ac 100644
--- a/libmpdemux/asfheader.c
+++ b/libmpdemux/asfheader.c
@@ -709,7 +709,7 @@ return 1;
len_err_out:
mp_tmsg(MSGT_HEADER, MSGL_FATAL, "Invalid length in ASF header!\n");
err_out:
- if (hdr) free(hdr);
- if (streams) free(streams);
+ free(hdr);
+ free(streams);
return 0;
}
diff --git a/libmpdemux/demux_aac.c b/libmpdemux/demux_aac.c
index 1924ec97b1..9d37d75cf8 100644
--- a/libmpdemux/demux_aac.c
+++ b/libmpdemux/demux_aac.c
@@ -64,8 +64,7 @@ static void demux_close_aac(demuxer_t *demuxer)
if(!priv)
return;
- if(priv->buf)
- free(priv->buf);
+ free(priv->buf);
free(demuxer->priv);
diff --git a/libmpdemux/demux_asf.c b/libmpdemux/demux_asf.c
index c6937176c2..dd6829612f 100644
--- a/libmpdemux/demux_asf.c
+++ b/libmpdemux/demux_asf.c
@@ -673,12 +673,8 @@ static void demux_close_asf(demuxer_t *demuxer) {
if (!asf) return;
- if (asf->aud_repdata_sizes)
- free(asf->aud_repdata_sizes);
-
- if (asf->vid_repdata_sizes)
- free(asf->vid_repdata_sizes);
-
+ free(asf->aud_repdata_sizes);
+ free(asf->vid_repdata_sizes);
free(asf);
}
diff --git a/libmpdemux/demux_audio.c b/libmpdemux/demux_audio.c
index 84ecc50130..f5c476d250 100644
--- a/libmpdemux/demux_audio.c
+++ b/libmpdemux/demux_audio.c
@@ -668,8 +668,6 @@ static void demux_audio_seek(demuxer_t *demuxer,float rel_seek_secs,float audio_
static void demux_close_audio(demuxer_t* demuxer) {
da_priv_t* priv = demuxer->priv;
- if(!priv)
- return;
free(priv);
}
diff --git a/libmpdemux/demux_film.c b/libmpdemux/demux_film.c
index 57d8296d80..c720e85887 100644
--- a/libmpdemux/demux_film.c
+++ b/libmpdemux/demux_film.c
@@ -457,8 +457,7 @@ static void demux_close_film(demuxer_t* demuxer) {
if(!film_data)
return;
- if(film_data->chunks)
- free(film_data->chunks);
+ free(film_data->chunks);
free(film_data);
}
diff --git a/libmpdemux/demux_fli.c b/libmpdemux/demux_fli.c
index 02a84f085f..e89fa75d97 100644
--- a/libmpdemux/demux_fli.c
+++ b/libmpdemux/demux_fli.c
@@ -190,11 +190,8 @@ static void demux_close_fli(demuxer_t* demuxer) {
if(!frames)
return;
- if(frames->filepos)
- free(frames->filepos);
- if(frames->frame_size)
- free(frames->frame_size);
-
+ free(frames->filepos);
+ free(frames->frame_size);
free(frames);
}
diff --git a/libmpdemux/demux_mf.c b/libmpdemux/demux_mf.c
index e4405aedad..6a463deb5e 100644
--- a/libmpdemux/demux_mf.c
+++ b/libmpdemux/demux_mf.c
@@ -179,8 +179,6 @@ static demuxer_t* demux_open_mf(demuxer_t* demuxer){
static void demux_close_mf(demuxer_t* demuxer) {
mf_t *mf = demuxer->priv;
- if(!mf)
- return;
free(mf);
}
diff --git a/libmpdemux/demux_mng.c b/libmpdemux/demux_mng.c
index 525972936a..d45add658f 100644
--- a/libmpdemux/demux_mng.c
+++ b/libmpdemux/demux_mng.c
@@ -475,8 +475,7 @@ static void demux_mng_close(demuxer_t* demuxer)
mng_cleanup(&mng_priv->h_mng);
// free private data
- if (mng_priv->canvas)
- free(mng_priv->canvas);
+ free(mng_priv->canvas);
free(mng_priv);
}
diff --git a/libmpdemux/demux_mpc.c b/libmpdemux/demux_mpc.c
index dee3b5c8dd..234eed45da 100644
--- a/libmpdemux/demux_mpc.c
+++ b/libmpdemux/demux_mpc.c
@@ -199,8 +199,6 @@ static void demux_mpc_seek(demuxer_t *demuxer,float rel_seek_secs,float audio_de
static void demux_close_mpc(demuxer_t* demuxer) {
da_priv_t* priv = demuxer->priv;
- if(!priv)
- return;
free(priv);
}
diff --git a/libmpdemux/demux_mpg.c b/libmpdemux/demux_mpg.c
index 6c257b5869..cc798a0430 100644
--- a/libmpdemux/demux_mpg.c
+++ b/libmpdemux/demux_mpg.c
@@ -246,7 +246,7 @@ static demuxer_t* demux_mpg_open(demuxer_t* demuxer) {
static void demux_close_mpg(demuxer_t* demuxer) {
mpg_demuxer_t* mpg_d = demuxer->priv;
- if (mpg_d) free(mpg_d);
+ free(mpg_d);
}
diff --git a/libmpdemux/demux_nsv.c b/libmpdemux/demux_nsv.c
index b9c6a0fc17..40ed1d06d6 100644
--- a/libmpdemux/demux_nsv.c
+++ b/libmpdemux/demux_nsv.c
@@ -322,8 +322,6 @@ static int nsv_check_file ( demuxer_t* demuxer )
static void demux_close_nsv(demuxer_t* demuxer) {
nsv_priv_t* priv = demuxer->priv;
- if(!priv)
- return;
free(priv);
}
diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c
index fe6bd27601..1883c36cd1 100644
--- a/libmpdemux/demux_ogg.c
+++ b/libmpdemux/demux_ogg.c
@@ -436,11 +436,10 @@ static void demux_ogg_check_comments(demuxer_t *d, ogg_stream_t *os,
sh_sub_t *sh;
// in case of malicious files with more than one lang per track:
- if (ogg_d->text_langs[index])
- free(ogg_d->text_langs[index]);
+ free(ogg_d->text_langs[index]);
ogg_d->text_langs[index] = strdup(val);
sh = d->s_streams[index];
- if (sh && sh->lang)
+ if (sh)
free(sh->lang);
if (sh)
sh->lang = strdup(val);
@@ -1606,13 +1605,11 @@ static void demux_close_ogg(demuxer_t *demuxer)
}
free(ogg_d->subs);
}
- if (ogg_d->syncpoints)
- free(ogg_d->syncpoints);
- if (ogg_d->text_ids)
- free(ogg_d->text_ids);
+ free(ogg_d->syncpoints);
+ free(ogg_d->text_ids);
if (ogg_d->text_langs) {
for (i = 0; i < ogg_d->n_text; i++)
- if (ogg_d->text_langs[i]) free(ogg_d->text_langs[i]);
+ free(ogg_d->text_langs[i]);
free(ogg_d->text_langs);
}
free(ogg_d);
diff --git a/libmpdemux/demux_pva.c b/libmpdemux/demux_pva.c
index 218833178a..dc25d29662 100644
--- a/libmpdemux/demux_pva.c
+++ b/libmpdemux/demux_pva.c
@@ -515,11 +515,8 @@ static void demux_seek_pva(demuxer_t * demuxer,float rel_seek_secs,float audio_d
static void demux_close_pva(demuxer_t * demuxer)
{
- if(demuxer->priv)
- {
- free(demuxer->priv);
- demuxer->priv=NULL;
- }
+ free(demuxer->priv);
+ demuxer->priv = NULL;
}
diff --git a/libmpdemux/demux_real.c b/libmpdemux/demux_real.c
index 644b927e1f..59bff0c561 100644
--- a/libmpdemux/demux_real.c
+++ b/libmpdemux/demux_real.c
@@ -1625,8 +1625,7 @@ skip_this_chunk:
#else
stream_skip(demuxer->stream, codec_data_size - tmp);
#endif
- if (mimet)
- free (mimet);
+ free (mimet);
break;
// }
}
@@ -1765,12 +1764,9 @@ static void demux_close_real(demuxer_t *demuxer)
if (priv){
for(i=0; i<MAX_STREAMS; i++)
- if(priv->index_table[i])
- free(priv->index_table[i]);
- if (priv->audio_buf)
- free(priv->audio_buf);
- if (priv->audio_timestamp)
- free(priv->audio_timestamp);
+ free(priv->index_table[i]);
+ free(priv->audio_buf);
+ free(priv->audio_timestamp);
free(priv);
}
diff --git a/libmpdemux/demux_realaud.c b/libmpdemux/demux_realaud.c
index 7284d4d7af..ece05edf1e 100644
--- a/libmpdemux/demux_realaud.c
+++ b/libmpdemux/demux_realaud.c
@@ -333,14 +333,12 @@ static demuxer_t* demux_open_ra(demuxer_t* demuxer)
static void demux_close_ra(demuxer_t *demuxer)
{
- ra_priv_t* ra_priv = demuxer->priv;
+ ra_priv_t* ra_priv = demuxer->priv;
if (ra_priv) {
- if (ra_priv->audio_buf)
- free (ra_priv->audio_buf);
- free(ra_priv);
+ free(ra_priv->audio_buf);
+ free(ra_priv);
}
- return;
}
diff --git a/libmpdemux/demux_roq.c b/libmpdemux/demux_roq.c
index a9bd1f291c..aafcd29468 100644
--- a/libmpdemux/demux_roq.c
+++ b/libmpdemux/demux_roq.c
@@ -259,8 +259,6 @@ static demuxer_t* demux_open_roq(demuxer_t* demuxer)
static void demux_close_roq(demuxer_t* demuxer) {
roq_data_t *roq_data = demuxer->priv;
- if(!roq_data)
- return;
free(roq_data);
}
diff --git a/libmpdemux/demux_rtp_codec.cpp b/libmpdemux/demux_rtp_codec.cpp
index 86d41ddae1..f0c3476aa5 100644
--- a/libmpdemux/demux_rtp_codec.cpp
+++ b/libmpdemux/demux_rtp_codec.cpp
@@ -70,7 +70,7 @@ static unsigned char* parseH264ConfigStr( char const* configStr,
psz += strlen(psz)+1;
}
- if( dup ) free( dup );
+ free( dup );
return cfg;
}
diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c
index 30c063695d..da41f14c5a 100644
--- a/libmpdemux/demux_ts.c
+++ b/libmpdemux/demux_ts.c
@@ -1102,19 +1102,15 @@ static void demux_close_ts(demuxer_t * demuxer)
if(priv)
{
- if(priv->pat.section.buffer)
- free(priv->pat.section.buffer);
- if(priv->pat.progs)
- free(priv->pat.progs);
+ free(priv->pat.section.buffer);
+ free(priv->pat.progs);
if(priv->pmt)
{
for(i = 0; i < priv->pmt_cnt; i++)
{
- if(priv->pmt[i].section.buffer)
- free(priv->pmt[i].section.buffer);
- if(priv->pmt[i].es)
- free(priv->pmt[i].es);
+ free(priv->pmt[i].section.buffer);
+ free(priv->pmt[i].es);
}
free(priv->pmt);
}
diff --git a/libmpdemux/demux_viv.c b/libmpdemux/demux_viv.c
index c416aa1535..0f14033976 100644
--- a/libmpdemux/demux_viv.c
+++ b/libmpdemux/demux_viv.c
@@ -230,12 +230,9 @@ static void vivo_parse_text_header(demuxer_t *demux, int header_len)
token = strtok(NULL, (char *)&("\x0d\x0a"));
}
- if (buf)
- free(buf);
- if (opt)
- free(opt);
- if (param)
- free(param);
+ free(buf);
+ free(opt);
+ free(param);
}
static int vivo_check_file(demuxer_t* demuxer){
@@ -745,14 +742,10 @@ static void demux_close_vivo(demuxer_t *demuxer)
vivo_priv_t* priv=demuxer->priv;
if (priv) {
- if (priv->title)
- free(priv->title);
- if (priv->author)
- free(priv->author);
- if (priv->copyright)
- free(priv->copyright);
- if (priv->producer)
- free(priv->producer);
+ free(priv->title);
+ free(priv->author);
+ free(priv->copyright);
+ free(priv->producer);
free(priv);
}
return;
diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h
index 0e28dbfb6b..9b66e27910 100644
--- a/libmpdemux/demuxer.h
+++ b/libmpdemux/demuxer.h
@@ -313,7 +313,7 @@ static inline void resize_demux_packet(demux_packet_t* dp, int len)
}
else
{
- if(dp->buffer) free(dp->buffer);
+ free(dp->buffer);
dp->buffer=NULL;
}
dp->len=len;
@@ -338,7 +338,7 @@ static inline void free_demux_packet(demux_packet_t* dp){
if (dp->master==NULL){ //dp is a master packet
dp->refcount--;
if (dp->refcount==0){
- if (dp->buffer) free(dp->buffer);
+ free(dp->buffer);
free(dp);
}
return;
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 11:14:31 +0000