Browse Source

Remove a few if (p) av_freep(&p) forms

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 523d9407d5)
tags/n0.8
Clément Bœsch Michael Niedermayer 14 years ago
parent
commit
b9004bd50c
3 changed files with 3 additions and 5 deletions
  1. +1
    -2
      libavcodec/libxvidff.c
  2. +1
    -1
      libavutil/tree.h
  3. +1
    -2
      libswscale/swscale-test.c

+ 1
- 2
libavcodec/libxvidff.c View File

@@ -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);


+ 1
- 1
libavutil/tree.h View File

@@ -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


+ 1
- 2
libswscale/swscale-test.c View File

@@ -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++) {


Loading…
Cancel
Save