[FFmpeg-cvslog] lavfi/drawtext: use av_opt_free() to free private context

Stefano Sabatini git at videolan.org
Mon Jun 25 22:49:46 CEST 2012


ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Mon Jun 25 22:41:33 2012 +0200| [9b41ec4b9e99aa5a3f2b46311fe8e2f2b6822133] | committer: Stefano Sabatini

lavfi/drawtext: use av_opt_free() to free private context

Simplify code.

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

 libavfilter/vf_drawtext.c |   11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c
index dc2e871..e5ba32e 100644
--- a/libavfilter/vf_drawtext.c
+++ b/libavfilter/vf_drawtext.c
@@ -511,16 +511,7 @@ static av_cold void uninit(AVFilterContext *ctx)
     av_expr_free(dtext->x_pexpr); dtext->x_pexpr = NULL;
     av_expr_free(dtext->y_pexpr); dtext->y_pexpr = NULL;
     av_expr_free(dtext->draw_pexpr); dtext->draw_pexpr = NULL;
-
-    av_freep(&dtext->boxcolor_string);
-    av_freep(&dtext->expanded_text);
-    av_freep(&dtext->fontcolor_string);
-    av_freep(&dtext->fontfile);
-    av_freep(&dtext->shadowcolor_string);
-    av_freep(&dtext->text);
-    av_freep(&dtext->x_expr);
-    av_freep(&dtext->y_expr);
-    av_freep(&dtext->draw_expr);
+    av_opt_free(dtext);
 
     av_freep(&dtext->positions);
     dtext->nb_positions = 0;



More information about the ffmpeg-cvslog mailing list