summaryrefslogtreecommitdiff
authorMichael Niedermayer <michaelni@gmx.at>2013-09-16 20:44:15 (GMT)
committer Michael Niedermayer <michaelni@gmx.at>2013-09-16 20:44:15 (GMT)
commit9078b40d354b1e3e8995ca781d4ccfda0044a8f4 (patch)
treefe133d189c1eff5a4e376fc18246e0229b8e7946
parentc051d668b5dbf040f92551f78b1b13635b8fcfb8 (diff)
downloadffmpeg-9078b40d354b1e3e8995ca781d4ccfda0044a8f4.zip
ffmpeg-9078b40d354b1e3e8995ca781d4ccfda0044a8f4.tar.gz
ffmpeg-9078b40d354b1e3e8995ca781d4ccfda0044a8f4.tar.bz2
swresample: replace 2 av_free() by av_freep()
avoids leaving stale pointers in memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat
-rw-r--r--libswresample/resample.c2
-rw-r--r--libswresample/swresample.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/libswresample/resample.c b/libswresample/resample.c
index fb9da7c..8b1b6ca 100644
--- a/libswresample/resample.c
+++ b/libswresample/resample.c
@@ -256,7 +256,7 @@ static ResampleContext *resample_init(ResampleContext *c, int out_rate, int in_r
return c;
error:
- av_free(c->filter_bank);
+ av_freep(&c->filter_bank);
av_free(c);
return NULL;
}
diff --git a/libswresample/swresample.c b/libswresample/swresample.c
index cdfe5bf..b9a3c3d 100644
--- a/libswresample/swresample.c
+++ b/libswresample/swresample.c
@@ -468,7 +468,7 @@ int swri_realloc_audio(AudioData *a, int count){
if(a->planar) memcpy(a->ch[i], old.ch[i], a->count*a->bps);
}
if(!a->planar) memcpy(a->ch[0], old.ch[0], a->count*a->ch_count*a->bps);
- av_free(old.data);
+ av_freep(&old.data);
a->count= count;
return 1;