Drop unneeded checks before av_free() and change to av_freep() where it's more suitable.

Originally committed as revision 6212 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/kmvc.c b/libavcodec/kmvc.c
index 036efa5..9623173 100644 (file)
--- a/libavcodec/kmvc.c
+++ b/libavcodec/kmvc.c
@@ -395,10 +395,8 @@ static int decode_end(AVCodecContext * avctx)
 {
     KmvcContext *const c = (KmvcContext *) avctx->priv_data;
 
-    if (c->frm0)
-        av_free(c->frm0);
-    if (c->frm1)
-        av_free(c->frm1);
+    av_freep(&c->frm0);
+    av_freep(&c->frm1);
     if (c->pic.data[0])
         avctx->release_buffer(avctx, &c->pic);
 

diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c
index 162c68a..2d4c1e2 100644 (file)
--- a/libavcodec/smacker.c
+++ b/libavcodec/smacker.c
@@ -550,14 +550,10 @@ static int decode_end(AVCodecContext *avctx)
 {
     SmackVContext * const smk = (SmackVContext *)avctx->priv_data;
 
-    if(smk->mmap_tbl)
-        av_free(smk->mmap_tbl);
-    if(smk->mclr_tbl)
-        av_free(smk->mclr_tbl);
-    if(smk->full_tbl)
-        av_free(smk->full_tbl);
-    if(smk->type_tbl)
-        av_free(smk->type_tbl);
+    av_freep(&smk->mmap_tbl);
+    av_freep(&smk->mclr_tbl);
+    av_freep(&smk->full_tbl);
+    av_freep(&smk->type_tbl);
 
     if (smk->pic.data[0])
         avctx->release_buffer(avctx, &smk->pic);

diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index 79c1d2e..a485384 100644 (file)
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -4165,18 +4165,18 @@ static int vc1_decode_frame(AVCodecContext *avctx,
     // do parse frame header
     if(v->profile < PROFILE_ADVANCED) {
         if(vc1_parse_frame_header(v, &s->gb) == -1) {
-            if(buf2)av_free(buf2);
+            av_free(buf2);
             return -1;
         }
     } else {
         if(vc1_parse_frame_header_adv(v, &s->gb) == -1) {
-            if(buf2)av_free(buf2);
+            av_free(buf2);
             return -1;
         }
     }
 
     if(s->pict_type != I_TYPE && !v->res_rtm_flag){
-        if(buf2)av_free(buf2);
+        av_free(buf2);
         return -1;
     }
 
@@ -4186,7 +4186,7 @@ static int vc1_decode_frame(AVCodecContext *avctx,
 
     /* skip B-frames if we don't have reference frames */
     if(s->last_picture_ptr==NULL && (s->pict_type==B_TYPE || s->dropable)){
-        if(buf2)av_free(buf2);
+        av_free(buf2);
         return -1;//buf_size;
     }
     /* skip b frames if we are in a hurry */
@@ -4194,12 +4194,12 @@ static int vc1_decode_frame(AVCodecContext *avctx,
     if(   (avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type==B_TYPE)
        || (avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type!=I_TYPE)
        ||  avctx->skip_frame >= AVDISCARD_ALL) {
-        if(buf2)av_free(buf2);
+        av_free(buf2);
         return buf_size;
     }
     /* skip everything if we are in a hurry>=5 */
     if(avctx->hurry_up>=5) {
-        if(buf2)av_free(buf2);
+        av_free(buf2);
         return -1;//buf_size;
     }
 
@@ -4211,7 +4211,7 @@ static int vc1_decode_frame(AVCodecContext *avctx,
     }
 
     if(MPV_frame_start(s, avctx) < 0) {
-        if(buf2)av_free(buf2);
+        av_free(buf2);
         return -1;
     }
 
@@ -4243,7 +4243,7 @@ assert(s->current_picture.pict_type == s->pict_type);
     /* we substract 1 because it is added on utils.c    */
     avctx->frame_number = s->picture_number - 1;
 
-    if(buf2)av_free(buf2);
+    av_free(buf2);
     return buf_size;
 }
 

diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c
index fd8497d..fdca4d2 100644 (file)
--- a/libavcodec/zmbv.c
+++ b/libavcodec/zmbv.c
@@ -671,10 +671,8 @@ static int decode_end(AVCodecContext *avctx)
 #ifdef CONFIG_ZLIB
     inflateEnd(&(c->zstream));
 #endif
-    if(c->cur)
-        av_freep(&c->cur);
-    if(c->prev)
-        av_freep(&c->prev);
+    av_freep(&c->cur);
+    av_freep(&c->prev);
 
     return 0;
 }