diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2013-04-11 21:08:46 +0200 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2013-04-11 21:37:48 +0200 |
| commit | 976e3439ed992b8e06e3737642448a3935b148e4 (patch) | |
| tree | 518fb36355f4f06b6eba7042d64fcc6b853130d7 | |
| parent | 160ed967f459966191de34f4fc8fc1664d1ff2e6 (diff) | |
lavfi/flite: switch to AVOption-based system
| -rw-r--r-- | doc/filters.texi | 5 | ||||
| -rw-r--r-- | libavfilter/asrc_flite.c | 8 | ||||
| -rw-r--r-- | libavfilter/avfilter.c | 1 |
3 files changed, 1 insertions, 13 deletions
diff --git a/doc/filters.texi b/doc/filters.texi index ee44b5f632..c6cf678c73 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 c13eb8b271..ee8774d37d 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 3e2077d724..c088f41c6a 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", |