aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2016-11-29 21:49:22 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2016-12-01 09:53:38 +0100
commitd44af9a38e6b116e1a89b2862f4d4f8cb9855387 (patch)
tree9ff40ec17bbfce52190b2a64288136db9ec92f60
parent4e6d1c1f4ec83000a067ff14452b34c1f2d2a43a (diff)
downloadffmpeg-d44af9a38e6b116e1a89b2862f4d4f8cb9855387.tar.gz
lavfi: Fix aix compilation.
Rename hz in af_apulsator.c and avf_showspectrum.c as hertz. The aix header sys/m_param.h defines hz as __hz.
-rw-r--r--libavfilter/af_apulsator.c6
-rw-r--r--libavfilter/avf_showspectrum.c12
2 files changed, 9 insertions, 9 deletions
diff --git a/libavfilter/af_apulsator.c b/libavfilter/af_apulsator.c
index 802b8d0256..67711a28ce 100644
--- a/libavfilter/af_apulsator.c
+++ b/libavfilter/af_apulsator.c
@@ -47,7 +47,7 @@ typedef struct AudioPulsatorContext {
double offset_r;
double pwidth;
double bpm;
- double hz;
+ double hertz;
int ms;
int timing;
@@ -76,7 +76,7 @@ static const AVOption apulsator_options[] = {
{ "hz", NULL, 0, AV_OPT_TYPE_CONST, {.i64=UNIT_HZ}, 0, 0, FLAGS, "timing" },
{ "bpm", "set BPM", OFFSET(bpm), AV_OPT_TYPE_DOUBLE, {.dbl=120}, 30, 300, FLAGS },
{ "ms", "set ms", OFFSET(ms), AV_OPT_TYPE_INT, {.i64=500}, 10, 2000, FLAGS },
- { "hz", "set frequency", OFFSET(hz), AV_OPT_TYPE_DOUBLE, {.dbl=2}, 0.01, 100, FLAGS },
+ { "hz", "set frequency", OFFSET(hertz), AV_OPT_TYPE_DOUBLE, {.dbl=2}, 0.01, 100, FLAGS },
{ NULL }
};
@@ -208,7 +208,7 @@ static int config_input(AVFilterLink *inlink)
switch (s->timing) {
case UNIT_BPM: freq = s->bpm / 60; break;
case UNIT_MS: freq = 1 / (s->ms / 1000.); break;
- case UNIT_HZ: freq = s->hz; break;
+ case UNIT_HZ: freq = s->hertz; break;
default: av_assert0(0);
}
diff --git a/libavfilter/avf_showspectrum.c b/libavfilter/avf_showspectrum.c
index f63fbe8b20..8a08b20cc3 100644
--- a/libavfilter/avf_showspectrum.c
+++ b/libavfilter/avf_showspectrum.c
@@ -1120,13 +1120,13 @@ static int showspectrumpic_request_frame(AVFilterLink *outlink)
dst[x] = 200;
}
for (y = 0; y < h; y += 40) {
- float hz = y * (inlink->sample_rate / 2) / (float)(1 << (int)ceil(log2(h)));
+ float hertz = y * (inlink->sample_rate / 2) / (float)(1 << (int)ceil(log2(h)));
char *units;
- if (hz == 0)
+ if (hertz == 0)
units = av_asprintf("DC");
else
- units = av_asprintf("%.2f", hz);
+ units = av_asprintf("%.2f", hertz);
if (!units)
return AVERROR(ENOMEM);
@@ -1185,13 +1185,13 @@ static int showspectrumpic_request_frame(AVFilterLink *outlink)
dst[x] = 200;
}
for (x = 0; x < w; x += 80) {
- float hz = x * (inlink->sample_rate / 2) / (float)(1 << (int)ceil(log2(w)));
+ float hertz = x * (inlink->sample_rate / 2) / (float)(1 << (int)ceil(log2(w)));
char *units;
- if (hz == 0)
+ if (hertz == 0)
units = av_asprintf("DC");
else
- units = av_asprintf("%.2f", hz);
+ units = av_asprintf("%.2f", hertz);
if (!units)
return AVERROR(ENOMEM);