summaryrefslogtreecommitdiff
path: root/libavfilter/af_adelay.c
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2019-01-01 13:33:16 +0100
committerPaul B Mahol <onemda@gmail.com>2019-01-01 13:33:16 +0100
commit35a8179149c1995c4b720f0e9ac7762c5a9a46df (patch)
treecf891e69736457fc959524cec315def456690a96 /libavfilter/af_adelay.c
parente1f7881d926f960cbf49f870d9c94393d5b4dbde (diff)
downloadffmpeg-35a8179149c1995c4b720f0e9ac7762c5a9a46df.tar.gz
avfilter/af_adelay: allow setting delays in seconds
Diffstat (limited to 'libavfilter/af_adelay.c')
-rw-r--r--libavfilter/af_adelay.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavfilter/af_adelay.c b/libavfilter/af_adelay.c
index 7bc731d48a..eb97039566 100644
--- a/libavfilter/af_adelay.c
+++ b/libavfilter/af_adelay.c
@@ -141,7 +141,7 @@ static int config_input(AVFilterLink *inlink)
p = s->delays;
for (i = 0; i < s->nb_delays; i++) {
ChanDelay *d = &s->chandelay[i];
- float delay;
+ float delay, div;
char type = 0;
int ret;
@@ -152,8 +152,9 @@ static int config_input(AVFilterLink *inlink)
ret = av_sscanf(arg, "%d%c", &d->delay, &type);
if (ret != 2 || type != 'S') {
+ div = type == 's' ? 1.0 : 1000.0;
av_sscanf(arg, "%f", &delay);
- d->delay = delay * inlink->sample_rate / 1000.0;
+ d->delay = delay * inlink->sample_rate / div;
}
if (d->delay < 0) {