Browse code

lavfi/flite: switch to AVOption-based system

Stefano Sabatini authored on 2013/04/12 04:08:46
Showing 3 changed files
... ...
@@ -1664,10 +1664,7 @@ To enable compilation of this filter you need to configure FFmpeg with
1664 1664
 
1665 1665
 Note that the flite library is not thread-safe.
1666 1666
 
1667
-The source accepts parameters as a list of @var{key}=@var{value} pairs,
1668
-separated by ":".
1669
-
1670
-The description of the accepted parameters follows.
1667
+The filter accepts the following options:
1671 1668
 
1672 1669
 @table @option
1673 1670
 
... ...
@@ -136,12 +136,6 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
136 136
     FliteContext *flite = ctx->priv;
137 137
     int ret = 0;
138 138
 
139
-    flite->class = &flite_class;
140
-    av_opt_set_defaults(flite);
141
-
142
-    if ((ret = av_set_options_string(flite, args, "=", ":")) < 0)
143
-        return ret;
144
-
145 139
     if (flite->list_voices) {
146 140
         list_voices(ctx, "\n");
147 141
         return AVERROR_EXIT;
... ...
@@ -200,8 +194,6 @@ static av_cold void uninit(AVFilterContext *ctx)
200 200
 {
201 201
     FliteContext *flite = ctx->priv;
202 202
 
203
-    av_opt_free(flite);
204
-
205 203
     if (!--flite->voice_entry->usage_count)
206 204
         flite->voice_entry->unregister_fn(flite->voice);
207 205
     flite->voice = NULL;
... ...
@@ -678,7 +678,6 @@ static const char *const filters_left_to_update[] = {
678 678
     "aconvert",
679 679
     "atempo",
680 680
     "buffer",
681
-    "flite",
682 681
     "mp",
683 682
     "pan",
684 683
     "scale",