From 5e02ff3e3d1522dcf37cd62314250116750fc0e2 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 26 Feb 2014 12:53:37 +0100 Subject: [PATCH] avfilter/af_compand: switch defaults to libavfilter/af_compand_fork.c Signed-off-by: Michael Niedermayer --- libavfilter/af_compand.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/libavfilter/af_compand.c b/libavfilter/af_compand.c index 10f7f0953e..24472f7985 100644 --- a/libavfilter/af_compand.c +++ b/libavfilter/af_compand.c @@ -72,9 +72,9 @@ typedef struct CompandContext { #define A AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM static const AVOption compand_options[] = { - { "attacks", "set time over which increase of volume is determined", OFFSET(attacks), AV_OPT_TYPE_STRING, { .str=NULL}, 0, 0, A }, - { "decays", "set time over which decrease of volume is determined", OFFSET(decays), AV_OPT_TYPE_STRING, { .str=NULL}, 0, 0, A }, - { "points", "set points of transfer function", OFFSET(points), AV_OPT_TYPE_STRING, { .str=NULL}, 0, 0, A }, + { "attacks", "set time over which increase of volume is determined", OFFSET(attacks), AV_OPT_TYPE_STRING, { .str = "0.3" }, 0, 0, A }, + { "decays", "set time over which decrease of volume is determined", OFFSET(decays), AV_OPT_TYPE_STRING, { .str = "0.8" }, 0, 0, A }, + { "points", "set points of transfer function", OFFSET(points), AV_OPT_TYPE_STRING, { .str = "-70/-70|-60/-20" }, 0, 0, A }, { "soft-knee", "set soft-knee", OFFSET(curve_dB), AV_OPT_TYPE_DOUBLE, { .dbl = 0.01 }, 0.01, 900, A }, { "gain", "set output gain", OFFSET(gain_dB), AV_OPT_TYPE_DOUBLE, { .dbl = 0 }, -900, 900, A }, { "volume", "set initial volume", OFFSET(initial_volume), AV_OPT_TYPE_DOUBLE, { .dbl = 0 }, -900, 0, A }, @@ -88,12 +88,6 @@ static av_cold int init(AVFilterContext *ctx) { CompandContext *s = ctx->priv; s->pts = AV_NOPTS_VALUE; - - if (!s->attacks || !s->decays || !s->points) { - av_log(ctx, AV_LOG_ERROR, "Missing attacks and/or decays and/or points.\n"); - return AVERROR(EINVAL); - } - return 0; }