[FFmpeg-cvslog] lavfi/flite: switch to AVOption-based system

[Stefano Sabatini]

ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Thu Apr 11 21:08:46 2013 +0200| [976e3439ed992b8e06e3737642448a3935b148e4] | committer: Stefano Sabatini

lavfi/flite: switch to AVOption-based system

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

 doc/filters.texi         |    5 +----
 libavfilter/asrc_flite.c |    8 --------
 libavfilter/avfilter.c   |    1 -
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/doc/filters.texi b/doc/filters.texi
index ee44b5f..c6cf678 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -1664,10 +1664,7 @@ To enable compilation of this filter you need to configure FFmpeg with
 
 Note that the flite library is not thread-safe.
 
-The source accepts parameters as a list of @var{key}=@var{value} pairs,
-separated by ":".
-
-The description of the accepted parameters follows.
+The filter accepts the following options:
 
 @table @option
 
diff --git a/libavfilter/asrc_flite.c b/libavfilter/asrc_flite.c
index c13eb8b..ee8774d 100644
--- a/libavfilter/asrc_flite.c
+++ b/libavfilter/asrc_flite.c
@@ -136,12 +136,6 @@ static av_cold int init(AVFilterContext *ctx, const char *args)
     FliteContext *flite = ctx->priv;
     int ret = 0;
 
-    flite->class = &flite_class;
-    av_opt_set_defaults(flite);
-
-    if ((ret = av_set_options_string(flite, args, "=", ":")) < 0)
-        return ret;
-
     if (flite->list_voices) {
         list_voices(ctx, "\n");
         return AVERROR_EXIT;
@@ -200,8 +194,6 @@ static av_cold void uninit(AVFilterContext *ctx)
 {
     FliteContext *flite = ctx->priv;
 
-    av_opt_free(flite);
-
     if (!--flite->voice_entry->usage_count)
         flite->voice_entry->unregister_fn(flite->voice);
     flite->voice = NULL;
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 3e2077d..c088f41 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -678,7 +678,6 @@ static const char *const filters_left_to_update[] = {
     "aconvert",
     "atempo",
     "buffer",
-    "flite",
     "mp",
     "pan",
     "scale",