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

Simplify code.
13 years ago · 9b41ec4b9e
parent 6be8cfa034
commit 9b41ec4b9e
1 changed files with 1 additions and 10 deletions
--- 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;