[FFmpeg-cvslog] sonic: use av_freep() as its safer than av_free()

Michael Niedermayer git at videolan.org
Sun Jun 23 20:27:51 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jun 23 19:45:39 2013 +0200| [9375f5003d0262c7c4740d85777277b99432335b] | committer: Michael Niedermayer

sonic: use av_freep() as its safer than av_free()

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9375f5003d0262c7c4740d85777277b99432335b
---

 libavcodec/sonic.c |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/libavcodec/sonic.c b/libavcodec/sonic.c
index 788bea6..9636c31 100644
--- a/libavcodec/sonic.c
+++ b/libavcodec/sonic.c
@@ -602,13 +602,13 @@ static av_cold int sonic_encode_close(AVCodecContext *avctx)
     int i;
 
     for (i = 0; i < s->channels; i++)
-        av_free(s->coded_samples[i]);
+        av_freep(&s->coded_samples[i]);
 
-    av_free(s->predictor_k);
-    av_free(s->tail);
-    av_free(s->tap_quant);
-    av_free(s->window);
-    av_free(s->int_samples);
+    av_freep(&s->predictor_k);
+    av_freep(&s->tail);
+    av_freep(&s->tap_quant);
+    av_freep(&s->window);
+    av_freep(&s->int_samples);
 
     return 0;
 }
@@ -838,14 +838,14 @@ static av_cold int sonic_decode_close(AVCodecContext *avctx)
     SonicContext *s = avctx->priv_data;
     int i;
 
-    av_free(s->int_samples);
-    av_free(s->tap_quant);
-    av_free(s->predictor_k);
+    av_freep(&s->int_samples);
+    av_freep(&s->tap_quant);
+    av_freep(&s->predictor_k);
 
     for (i = 0; i < s->channels; i++)
     {
-        av_free(s->predictor_state[i]);
-        av_free(s->coded_samples[i]);
+        av_freep(&s->predictor_state[i]);
+        av_freep(&s->coded_samples[i]);
     }
 
     return 0;



More information about the ffmpeg-cvslog mailing list