diff options
Diffstat (limited to 'libmpcodecs')
-rw-r--r-- | libmpcodecs/ad_mpc.c | 3 | ||||
-rw-r--r-- | libmpcodecs/ad_speex.c | 3 | ||||
-rw-r--r-- | libmpcodecs/dec_teletext.c | 9 | ||||
-rw-r--r-- | libmpcodecs/mp_image.c | 2 | ||||
-rw-r--r-- | libmpcodecs/vd_libmpeg2.c | 2 | ||||
-rw-r--r-- | libmpcodecs/vd_realvid.c | 5 | ||||
-rw-r--r-- | libmpcodecs/vd_xanim.c | 3 | ||||
-rw-r--r-- | libmpcodecs/vf_blackframe.c | 2 | ||||
-rw-r--r-- | libmpcodecs/vf_denoise3d.c | 2 | ||||
-rw-r--r-- | libmpcodecs/vf_eq.c | 2 | ||||
-rw-r--r-- | libmpcodecs/vf_fspp.c | 8 | ||||
-rw-r--r-- | libmpcodecs/vf_geq.c | 2 | ||||
-rw-r--r-- | libmpcodecs/vf_hqdn3d.c | 16 | ||||
-rw-r--r-- | libmpcodecs/vf_hue.c | 4 | ||||
-rw-r--r-- | libmpcodecs/vf_lavc.c | 2 | ||||
-rw-r--r-- | libmpcodecs/vf_mcdeint.c | 4 | ||||
-rw-r--r-- | libmpcodecs/vf_noise.c | 4 | ||||
-rw-r--r-- | libmpcodecs/vf_perspective.c | 2 | ||||
-rw-r--r-- | libmpcodecs/vf_pp7.c | 2 | ||||
-rw-r--r-- | libmpcodecs/vf_qp.c | 2 | ||||
-rw-r--r-- | libmpcodecs/vf_sab.c | 4 | ||||
-rw-r--r-- | libmpcodecs/vf_scale.c | 8 | ||||
-rw-r--r-- | libmpcodecs/vf_screenshot.c | 4 | ||||
-rw-r--r-- | libmpcodecs/vf_spp.c | 8 | ||||
-rw-r--r-- | libmpcodecs/vf_unsharp.c | 4 | ||||
-rw-r--r-- | libmpcodecs/vf_uspp.c | 4 |
26 files changed, 53 insertions, 58 deletions
diff --git a/libmpcodecs/ad_mpc.c b/libmpcodecs/ad_mpc.c index 31463abcb7..979dce6178 100644 --- a/libmpcodecs/ad_mpc.c +++ b/libmpcodecs/ad_mpc.c @@ -121,8 +121,7 @@ static int preinit(sh_audio_t *sh) { } static void uninit(sh_audio_t *sh) { - if (sh->context) - free(sh->context); + free(sh->context); sh->context = NULL; } diff --git a/libmpcodecs/ad_speex.c b/libmpcodecs/ad_speex.c index a93a245492..f80b4d633e 100644 --- a/libmpcodecs/ad_speex.c +++ b/libmpcodecs/ad_speex.c @@ -126,8 +126,7 @@ static void uninit(sh_audio_t *sh) { if (ctx) { speex_bits_destroy(&ctx->bits); speex_decoder_destroy(ctx->dec_context); - if (ctx->hdr) - free(ctx->hdr); + free(ctx->hdr); free(ctx); } ctx = NULL; diff --git a/libmpcodecs/dec_teletext.c b/libmpcodecs/dec_teletext.c index 215246af89..d619ecde80 100644 --- a/libmpcodecs/dec_teletext.c +++ b/libmpcodecs/dec_teletext.c @@ -1100,8 +1100,7 @@ static int decode_pkt0(priv_vbi_t* priv,unsigned char* data,int magAddr) if(d[i]&0x80){ pll_add(priv,2,4); - if(priv->mag[magAddr].pt) - free(priv->mag[magAddr].pt); + free(priv->mag[magAddr].pt); priv->mag[magAddr].pt=NULL; priv->mag[magAddr].order=0; return 0; @@ -1753,10 +1752,8 @@ int teletext_control(void* p, int cmd, void *arg) } case TV_VBI_CONTROL_STOP: { - if(priv->mag) - free(priv->mag); - if(priv->ptsp) - free(priv->ptsp); + free(priv->mag); + free(priv->ptsp); destroy_cache(priv); priv->page_changed=1; pthread_mutex_destroy(&priv->buffer_mutex); diff --git a/libmpcodecs/mp_image.c b/libmpcodecs/mp_image.c index 56229b181c..d250376276 100644 --- a/libmpcodecs/mp_image.c +++ b/libmpcodecs/mp_image.c @@ -191,7 +191,7 @@ void free_mp_image(mp_image_t* mpi){ if(!mpi) return; if(mpi->flags&MP_IMGFLAG_ALLOCATED){ /* becouse we allocate the whole image in once */ - if(mpi->planes[0]) av_free(mpi->planes[0]); + av_free(mpi->planes[0]); if (mpi->flags & MP_IMGFLAG_RGB_PALETTE) av_free(mpi->planes[1]); } diff --git a/libmpcodecs/vd_libmpeg2.c b/libmpcodecs/vd_libmpeg2.c index 2e9c0edf24..c686ad67a4 100644 --- a/libmpcodecs/vd_libmpeg2.c +++ b/libmpcodecs/vd_libmpeg2.c @@ -129,7 +129,7 @@ static void uninit(sh_video_t *sh){ int i; vd_libmpeg2_ctx_t *context = sh->context; mpeg2dec_t * mpeg2dec = context->mpeg2dec; - if (mpeg2dec->pending_buffer) free(mpeg2dec->pending_buffer); + free(mpeg2dec->pending_buffer); mpeg2dec->decoder.convert=NULL; mpeg2dec->decoder.convert_id=NULL; mpeg2_close (mpeg2dec); diff --git a/libmpcodecs/vd_realvid.c b/libmpcodecs/vd_realvid.c index c0994952ab..17250fe8ca 100644 --- a/libmpcodecs/vd_realvid.c +++ b/libmpcodecs/vd_realvid.c @@ -375,8 +375,7 @@ static void uninit(sh_video_t *sh){ #endif rv_handle=NULL; initialized = 0; - if (buffer) - free(buffer); + free(buffer); buffer = NULL; bufsz = 0; } @@ -406,7 +405,7 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ if(len<=0 || flags&2) return NULL; // skipped frame || hardframedrop if (bufsz < sh->disp_w*sh->disp_h*3/2) { - if (buffer) free(buffer); + free(buffer); bufsz = sh->disp_w*sh->disp_h*3/2; buffer=malloc(bufsz); if (!buffer) return 0; diff --git a/libmpcodecs/vd_xanim.c b/libmpcodecs/vd_xanim.c index d8a3a74004..7341088c47 100644 --- a/libmpcodecs/vd_xanim.c +++ b/libmpcodecs/vd_xanim.c @@ -771,8 +771,7 @@ static void uninit(sh_video_t *sh) close_func(); } dlclose(priv->file_handler); - if (priv->decinfo != NULL) - free(priv->decinfo); + free(priv->decinfo); free(priv); } diff --git a/libmpcodecs/vf_blackframe.c b/libmpcodecs/vf_blackframe.c index 1b00e9907f..244da01be2 100644 --- a/libmpcodecs/vf_blackframe.c +++ b/libmpcodecs/vf_blackframe.c @@ -115,7 +115,7 @@ static int control(struct vf_instance *vf, int request, void* data){ } static void uninit(struct vf_instance *vf) { - if (vf->priv) free(vf->priv); + free(vf->priv); } static int vf_open(vf_instance_t *vf, char *args){ diff --git a/libmpcodecs/vf_denoise3d.c b/libmpcodecs/vf_denoise3d.c index d18b8cb125..4d1f16c8b7 100644 --- a/libmpcodecs/vf_denoise3d.c +++ b/libmpcodecs/vf_denoise3d.c @@ -49,7 +49,7 @@ static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ - if(vf->priv->Line) free(vf->priv->Line); + free(vf->priv->Line); vf->priv->Line = malloc(width); vf->priv->pmpi=NULL; // vf->default_caps &= !VFCAP_ACCEPT_STRIDE; diff --git a/libmpcodecs/vf_eq.c b/libmpcodecs/vf_eq.c index 1cbffb24eb..5925c86451 100644 --- a/libmpcodecs/vf_eq.c +++ b/libmpcodecs/vf_eq.c @@ -215,7 +215,7 @@ static int query_format(struct vf_instance *vf, unsigned int fmt) static void uninit(struct vf_instance *vf) { - if (vf->priv->buf) free(vf->priv->buf); + free(vf->priv->buf); free(vf->priv); } diff --git a/libmpcodecs/vf_fspp.c b/libmpcodecs/vf_fspp.c index 1819ac636c..c84422104f 100644 --- a/libmpcodecs/vf_fspp.c +++ b/libmpcodecs/vf_fspp.c @@ -576,13 +576,13 @@ static void uninit(struct vf_instance *vf) { if(!vf->priv) return; - if(vf->priv->temp) av_free(vf->priv->temp); + av_free(vf->priv->temp); vf->priv->temp= NULL; - if(vf->priv->src) av_free(vf->priv->src); + av_free(vf->priv->src); vf->priv->src= NULL; - //if(vf->priv->avctx) free(vf->priv->avctx); + //free(vf->priv->avctx); //vf->priv->avctx= NULL; - if(vf->priv->non_b_qp) free(vf->priv->non_b_qp); + free(vf->priv->non_b_qp); vf->priv->non_b_qp= NULL; av_free(vf->priv); diff --git a/libmpcodecs/vf_geq.c b/libmpcodecs/vf_geq.c index b75806731f..ed855d1b7d 100644 --- a/libmpcodecs/vf_geq.c +++ b/libmpcodecs/vf_geq.c @@ -128,8 +128,6 @@ static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ } static void uninit(struct vf_instance *vf){ - if(!vf->priv) return; - av_free(vf->priv); vf->priv=NULL; } diff --git a/libmpcodecs/vf_hqdn3d.c b/libmpcodecs/vf_hqdn3d.c index 4e5e170085..95cdba1ef5 100644 --- a/libmpcodecs/vf_hqdn3d.c +++ b/libmpcodecs/vf_hqdn3d.c @@ -44,11 +44,17 @@ struct vf_priv_s { /***************************************************************************/ -static void uninit(struct vf_instance *vf){ - if(vf->priv->Line){free(vf->priv->Line);vf->priv->Line=NULL;} - if(vf->priv->Frame[0]){free(vf->priv->Frame[0]);vf->priv->Frame[0]=NULL;} - if(vf->priv->Frame[1]){free(vf->priv->Frame[1]);vf->priv->Frame[1]=NULL;} - if(vf->priv->Frame[2]){free(vf->priv->Frame[2]);vf->priv->Frame[2]=NULL;} +static void uninit(struct vf_instance *vf) +{ + free(vf->priv->Line); + free(vf->priv->Frame[0]); + free(vf->priv->Frame[1]); + free(vf->priv->Frame[2]); + + vf->priv->Line = NULL; + vf->priv->Frame[0] = NULL; + vf->priv->Frame[1] = NULL; + vf->priv->Frame[2] = NULL; } static int config(struct vf_instance *vf, diff --git a/libmpcodecs/vf_hue.c b/libmpcodecs/vf_hue.c index 221bee856d..47fe19ac57 100644 --- a/libmpcodecs/vf_hue.c +++ b/libmpcodecs/vf_hue.c @@ -158,8 +158,8 @@ static int query_format(struct vf_instance *vf, unsigned int fmt) static void uninit(struct vf_instance *vf) { - if (vf->priv->buf[0]) free(vf->priv->buf[0]); - if (vf->priv->buf[1]) free(vf->priv->buf[1]); + free(vf->priv->buf[0]); + free(vf->priv->buf[1]); free(vf->priv); } diff --git a/libmpcodecs/vf_lavc.c b/libmpcodecs/vf_lavc.c index 2efccf093b..2a1cf439f9 100644 --- a/libmpcodecs/vf_lavc.c +++ b/libmpcodecs/vf_lavc.c @@ -68,7 +68,7 @@ static int config(struct vf_instance *vf, } } - if(vf->priv->outbuf) free(vf->priv->outbuf); + free(vf->priv->outbuf); vf->priv->outbuf_size=10000+width*height; // must be enough! vf->priv->outbuf = malloc(vf->priv->outbuf_size); diff --git a/libmpcodecs/vf_mcdeint.c b/libmpcodecs/vf_mcdeint.c index 1d92697955..444314ef47 100644 --- a/libmpcodecs/vf_mcdeint.c +++ b/libmpcodecs/vf_mcdeint.c @@ -273,9 +273,9 @@ static void uninit(struct vf_instance *vf){ #if 0 for(i=0; i<3; i++){ - if(vf->priv->temp[i]) free(vf->priv->temp[i]); + free(vf->priv->temp[i]); vf->priv->temp[i]= NULL; - if(vf->priv->src[i]) free(vf->priv->src[i]); + free(vf->priv->src[i]); vf->priv->src[i]= NULL; } #endif diff --git a/libmpcodecs/vf_noise.c b/libmpcodecs/vf_noise.c index 525776ca8f..f8d4c2e6a3 100644 --- a/libmpcodecs/vf_noise.c +++ b/libmpcodecs/vf_noise.c @@ -370,10 +370,10 @@ static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ static void uninit(struct vf_instance *vf){ if(!vf->priv) return; - if(vf->priv->chromaParam.noise) av_free(vf->priv->chromaParam.noise); + av_free(vf->priv->chromaParam.noise); vf->priv->chromaParam.noise= NULL; - if(vf->priv->lumaParam.noise) av_free(vf->priv->lumaParam.noise); + av_free(vf->priv->lumaParam.noise); vf->priv->lumaParam.noise= NULL; free(vf->priv); diff --git a/libmpcodecs/vf_perspective.c b/libmpcodecs/vf_perspective.c index 21689d1f43..8c6caca059 100644 --- a/libmpcodecs/vf_perspective.c +++ b/libmpcodecs/vf_perspective.c @@ -132,7 +132,7 @@ static int config(struct vf_instance *vf, static void uninit(struct vf_instance *vf){ if(!vf->priv) return; - if(vf->priv->pv) free(vf->priv->pv); + free(vf->priv->pv); vf->priv->pv= NULL; free(vf->priv); diff --git a/libmpcodecs/vf_pp7.c b/libmpcodecs/vf_pp7.c index 932c3f588e..32e9a581c2 100644 --- a/libmpcodecs/vf_pp7.c +++ b/libmpcodecs/vf_pp7.c @@ -410,7 +410,7 @@ static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ static void uninit(struct vf_instance *vf){ if(!vf->priv) return; - if(vf->priv->src) free(vf->priv->src); + free(vf->priv->src); vf->priv->src= NULL; free(vf->priv); diff --git a/libmpcodecs/vf_qp.c b/libmpcodecs/vf_qp.c index 30a3d8ce13..d78cd8251e 100644 --- a/libmpcodecs/vf_qp.c +++ b/libmpcodecs/vf_qp.c @@ -144,7 +144,7 @@ static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ static void uninit(struct vf_instance *vf){ if(!vf->priv) return; - if(vf->priv->qp) av_free(vf->priv->qp); + av_free(vf->priv->qp); vf->priv->qp= NULL; av_free(vf->priv); diff --git a/libmpcodecs/vf_sab.c b/libmpcodecs/vf_sab.c index 0cb4fd9b19..7dccd21d10 100644 --- a/libmpcodecs/vf_sab.c +++ b/libmpcodecs/vf_sab.c @@ -153,10 +153,10 @@ static void freeBuffers(FilterParam *f){ if(f->preFilterContext) sws_freeContext(f->preFilterContext); f->preFilterContext=NULL; - if(f->preFilterBuf) free(f->preFilterBuf); + free(f->preFilterBuf); f->preFilterBuf=NULL; - if(f->distCoeff) free(f->distCoeff); + free(f->distCoeff); f->distCoeff=NULL; } diff --git a/libmpcodecs/vf_scale.c b/libmpcodecs/vf_scale.c index a8d7456aba..12c51ae685 100644 --- a/libmpcodecs/vf_scale.c +++ b/libmpcodecs/vf_scale.c @@ -303,10 +303,8 @@ static int config(struct vf_instance *vf, } vf->priv->fmt=best; - if(vf->priv->palette){ - free(vf->priv->palette); - vf->priv->palette=NULL; - } + free(vf->priv->palette); + vf->priv->palette=NULL; switch(best){ case IMGFMT_RGB8: { /* set 332 palette for 8 bpp */ @@ -526,7 +524,7 @@ static int query_format(struct vf_instance *vf, unsigned int fmt){ static void uninit(struct vf_instance *vf){ if(vf->priv->ctx) sws_freeContext(vf->priv->ctx); if(vf->priv->ctx2) sws_freeContext(vf->priv->ctx2); - if(vf->priv->palette) free(vf->priv->palette); + free(vf->priv->palette); free(vf->priv); } diff --git a/libmpcodecs/vf_screenshot.c b/libmpcodecs/vf_screenshot.c index 3ebcc17d3e..82b345b446 100644 --- a/libmpcodecs/vf_screenshot.c +++ b/libmpcodecs/vf_screenshot.c @@ -75,7 +75,7 @@ static int config(struct vf_instance *vf, vf->priv->dh = d_height; vf->priv->stride = (3*vf->priv->dw+15)&~15; - if (vf->priv->buffer) free(vf->priv->buffer); // probably reconfigured + free(vf->priv->buffer); // probably reconfigured vf->priv->buffer = NULL; return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); @@ -278,7 +278,7 @@ static void uninit(vf_instance_t *vf) avcodec_close(vf->priv->avctx); av_freep(&vf->priv->avctx); if(vf->priv->ctx) sws_freeContext(vf->priv->ctx); - if (vf->priv->buffer) av_free(vf->priv->buffer); + av_free(vf->priv->buffer); free(vf->priv->outbuffer); free(vf->priv); } diff --git a/libmpcodecs/vf_spp.c b/libmpcodecs/vf_spp.c index 5a4214d872..ab8a7d9dd0 100644 --- a/libmpcodecs/vf_spp.c +++ b/libmpcodecs/vf_spp.c @@ -515,13 +515,13 @@ static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ static void uninit(struct vf_instance *vf){ if(!vf->priv) return; - if(vf->priv->temp) free(vf->priv->temp); + free(vf->priv->temp); vf->priv->temp= NULL; - if(vf->priv->src) free(vf->priv->src); + free(vf->priv->src); vf->priv->src= NULL; - if(vf->priv->avctx) free(vf->priv->avctx); + free(vf->priv->avctx); vf->priv->avctx= NULL; - if(vf->priv->non_b_qp) free(vf->priv->non_b_qp); + free(vf->priv->non_b_qp); vf->priv->non_b_qp= NULL; free(vf->priv); diff --git a/libmpcodecs/vf_unsharp.c b/libmpcodecs/vf_unsharp.c index ae5f13654f..9014a2b6e3 100644 --- a/libmpcodecs/vf_unsharp.c +++ b/libmpcodecs/vf_unsharp.c @@ -212,12 +212,12 @@ static void uninit( struct vf_instance *vf ) { fp = &vf->priv->lumaParam; for( z=0; z<sizeof(fp->SC)/sizeof(fp->SC[0]); z++ ) { - if( fp->SC[z] ) av_free( fp->SC[z] ); + av_free( fp->SC[z] ); fp->SC[z] = NULL; } fp = &vf->priv->chromaParam; for( z=0; z<sizeof(fp->SC)/sizeof(fp->SC[0]); z++ ) { - if( fp->SC[z] ) av_free( fp->SC[z] ); + av_free( fp->SC[z] ); fp->SC[z] = NULL; } diff --git a/libmpcodecs/vf_uspp.c b/libmpcodecs/vf_uspp.c index 2e1e055ff5..6feb8eb468 100644 --- a/libmpcodecs/vf_uspp.c +++ b/libmpcodecs/vf_uspp.c @@ -303,9 +303,9 @@ static void uninit(struct vf_instance *vf){ if(!vf->priv) return; for(i=0; i<3; i++){ - if(vf->priv->temp[i]) free(vf->priv->temp[i]); + free(vf->priv->temp[i]); vf->priv->temp[i]= NULL; - if(vf->priv->src[i]) free(vf->priv->src[i]); + free(vf->priv->src[i]); vf->priv->src[i]= NULL; } for(i=0; i<BLOCK*BLOCK; i++){ |