summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Bœsch <ubitux@gmail.com>2013-04-10 22:13:12 +0200
committerClément Bœsch <ubitux@gmail.com>2013-04-10 23:16:02 +0200
commit5afd58fbb4571d8b9c81c7573c2a43d5ad15672a (patch)
treeb76ae7bc1b8da47a647e48aa81502ae2c5d5b8d3
parent4964ec2cd4822eb4d9b34e83b0a77c0592c7c192 (diff)
lavfi/ebur128: switch to an AVOptions-based system.
-rw-r--r--doc/filters.texi2
-rw-r--r--libavfilter/avfilter.c1
-rw-r--r--libavfilter/f_ebur128.c7
3 files changed, 2 insertions, 8 deletions
diff --git a/doc/filters.texi b/doc/filters.texi
index 561cdeeb0d..1155463712 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -6845,7 +6845,7 @@ the momentary loudness (400 milliseconds).
More information about the Loudness Recommendation EBU R128 on
@url{http://tech.ebu.ch/loudness}.
-The filter accepts the following named parameters:
+The filter accepts the following options:
@table @option
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 130fccfaf2..6ec944b467 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -664,6 +664,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
!strcmp(filter->filter->name, "delogo" ) ||
!strcmp(filter->filter->name, "drawbox" ) ||
!strcmp(filter->filter->name, "drawtext" ) ||
+ !strcmp(filter->filter->name, "ebur128" ) ||
!strcmp(filter->filter->name, "fade" ) ||
!strcmp(filter->filter->name, "fieldorder") ||
!strcmp(filter->filter->name, "fps" ) ||
diff --git a/libavfilter/f_ebur128.c b/libavfilter/f_ebur128.c
index 0c7f7714b4..2ff92a33c8 100644
--- a/libavfilter/f_ebur128.c
+++ b/libavfilter/f_ebur128.c
@@ -405,16 +405,9 @@ static struct hist_entry *get_histogram(void)
static av_cold int init(AVFilterContext *ctx, const char *args)
{
- int ret;
EBUR128Context *ebur128 = ctx->priv;
AVFilterPad pad;
- ebur128->class = &ebur128_class;
- av_opt_set_defaults(ebur128);
-
- if ((ret = av_set_options_string(ebur128, args, "=", ":")) < 0)
- return ret;
-
if (ebur128->loglevel != AV_LOG_INFO &&
ebur128->loglevel != AV_LOG_VERBOSE) {
if (ebur128->do_video || ebur128->metadata)