From 523d9407d57e9210428b6d962f0ebf48aae55638 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Date: Thu, 3 Feb 2011 11:30:17 +0100 Subject: [PATCH] Remove a few if (p) av_freep(&p) forms Signed-off-by: Mans Rullgard --- libavcodec/libxvidff.c | 3 +-- libavutil/tree.h | 2 +- libswscale/swscale-test.c | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/libavcodec/libxvidff.c b/libavcodec/libxvidff.c index 771fc2be64..9008b848ca 100644 --- a/libavcodec/libxvidff.c +++ b/libavcodec/libxvidff.c @@ -527,8 +527,7 @@ static av_cold int xvid_encode_close(AVCodecContext *avctx) { xvid_encore(x->encoder_handle, XVID_ENC_DESTROY, NULL, NULL); - if( avctx->extradata != NULL ) - av_freep(&avctx->extradata); + av_freep(&avctx->extradata); if( x->twopassbuffer != NULL ) { av_free(x->twopassbuffer); av_free(x->old_twopassbuffer); diff --git a/libavutil/tree.h b/libavutil/tree.h index bf09fd0be5..8c7de2ffbf 100644 --- a/libavutil/tree.h +++ b/libavutil/tree.h @@ -67,7 +67,7 @@ void *av_tree_find(const struct AVTreeNode *root, void *key, int (*cmp)(void *ke * return av_tree_insert(rootp, key, cmp, next); * } * void *tree_remove(struct AVTreeNode **rootp, void *key, int (*cmp)(void *key, const void *b, AVTreeNode **next)){ - * if(*next) av_freep(next); + * av_freep(next); * return av_tree_insert(rootp, key, cmp, next); * } * @endcode diff --git a/libswscale/swscale-test.c b/libswscale/swscale-test.c index ae5f8b70fa..bd24f3e006 100644 --- a/libswscale/swscale-test.c +++ b/libswscale/swscale-test.c @@ -104,8 +104,7 @@ static int doTest(uint8_t *ref[4], int refStride[4], int w, int h, int p; for (p = 0; p < 4; p++) - if (src[p]) - av_freep(&src[p]); + av_freep(&src[p]); av_image_fill_linesizes(srcStride, srcFormat, srcW); for (p = 0; p < 4; p++) {