@@ -332,9 +332,7 @@ static void delete_state(DVBSubContext *ctx)

         ctx->region_list = region->next;

         delete_region_display_list(ctx, region);

-        if (region->pbuf)

-            av_free(region->pbuf);

-

+        av_free(region->pbuf);

         av_free(region);

     }

@@ -1032,8 +1030,7 @@ static void dvbsub_parse_region_segment(AVCodecContext *avctx,

     buf += 2;

     if (region->width * region->height != region->buf_size) {

-        if (region->pbuf)

-            av_free(region->pbuf);

+        av_free(region->pbuf);

         region->buf_size = region->width * region->height;

@@ -133,8 +133,7 @@ static int flashsv_decode_frame(AVCodecContext *avctx,

     /* the block size could change between frames, make sure the buffer

      * is large enough, if not, get a larger one */

     if(s->block_size < s->block_width*s->block_height) {

-        if (s->tmpblock != NULL)

-            av_free(s->tmpblock);

+        av_free(s->tmpblock);

         if ((s->tmpblock = av_malloc(3*s->block_width*s->block_height)) == NULL) {

             av_log(avctx, AV_LOG_ERROR, "Can't allocate decompression buffer.\n");

             return -1;

@@ -243,8 +242,7 @@ static av_cold int flashsv_decode_end(AVCodecContext *avctx)

         avctx->release_buffer(avctx, &s->frame);

     /* free the tmpblock */

-    if (s->tmpblock != NULL)

-        av_free(s->tmpblock);

+    av_free(s->tmpblock);

     return 0;

 }

@@ -533,12 +533,9 @@ static av_cold int xvid_encode_close(AVCodecContext *avctx) {

         av_free(x->twopassbuffer);

         av_free(x->old_twopassbuffer);

     }

-    if( x->twopassfile != NULL )

-        av_free(x->twopassfile);

-    if( x->intra_matrix != NULL )

-        av_free(x->intra_matrix);

-    if( x->inter_matrix != NULL )

-        av_free(x->inter_matrix);

+    av_free(x->twopassfile);

+    av_free(x->intra_matrix);

+    av_free(x->inter_matrix);

     return 0;

 }

@@ -2227,8 +2227,7 @@ static av_cold int decode_close_mp3on4(AVCodecContext * avctx)

     int i;

     for (i = 0; i < s->frames; i++)

-        if (s->mp3decctx[i])

-            av_free(s->mp3decctx[i]);

+        av_free(s->mp3decctx[i]);

     return 0;

 }

@@ -677,12 +677,9 @@ static int smka_decode_frame(AVCodecContext *avctx, void *data, int *data_size,

     for(i = 0; i < 4; i++) {

         if(vlc[i].table)

             free_vlc(&vlc[i]);

-        if(h[i].bits)

-            av_free(h[i].bits);

-        if(h[i].lengths)

-            av_free(h[i].lengths);

-        if(h[i].values)

-            av_free(h[i].values);

+        av_free(h[i].bits);

+        av_free(h[i].lengths);

+        av_free(h[i].values);

     }

     *data_size = unp_size;

@@ -185,8 +185,7 @@ static int tm2_build_huff_table(TM2Context *ctx, TM2Codes *code)

 static void tm2_free_codes(TM2Codes *code)

 {

-    if(code->recode)

-        av_free(code->recode);

+    av_free(code->recode);

     if(code->vlc.table)

         free_vlc(&code->vlc);

 }

@@ -859,13 +858,10 @@ static av_cold int decode_end(AVCodecContext *avctx){

     AVFrame *pic = &l->pic;

     int i;

-    if(l->last)

-        av_free(l->last);

-    if(l->clast)

-        av_free(l->clast);

+    av_free(l->last);

+    av_free(l->clast);

     for(i = 0; i < TM2_NUM_STREAMS; i++)

-        if(l->tokens[i])

-            av_free(l->tokens[i]);

+        av_free(l->tokens[i]);

     if(l->Y1){

         av_free(l->Y1);

         av_free(l->U1);

@@ -449,8 +449,7 @@ static int tta_decode_frame(AVCodecContext *avctx,

 static av_cold int tta_decode_close(AVCodecContext *avctx) {

     TTAContext *s = avctx->priv_data;

-    if (s->decode_buffer)

-        av_free(s->decode_buffer);

+    av_free(s->decode_buffer);

     av_freep(&s->ch_ctx);

     return 0;

@@ -111,8 +111,7 @@ static int parse_fmtp_config(AVCodecContext * codec, char *value)

 {

     /* decode the hexa encoded parameter */

     int len = ff_hex_to_data(NULL, value);

-    if (codec->extradata)

-        av_free(codec->extradata);

+    av_free(codec->extradata);

     codec->extradata = av_mallocz(len + FF_INPUT_BUFFER_PADDING_SIZE);

     if (!codec->extradata)

         return AVERROR(ENOMEM);

@@ -334,12 +334,9 @@ static int smacker_read_close(AVFormatContext *s)

     int i;

     for(i = 0; i < 7; i++)

-        if(smk->bufs[i])

-            av_free(smk->bufs[i]);

-    if(smk->frm_size)

-        av_free(smk->frm_size);

-    if(smk->frm_flags)

-        av_free(smk->frm_flags);

+        av_free(smk->bufs[i]);

+    av_free(smk->frm_size);

+    av_free(smk->frm_flags);

     return 0;

 }