lavfi: Fix aix compilation.
authorCarl Eugen Hoyos <cehoyos@ag.or.at>
Tue, 29 Nov 2016 20:49:22 +0000 (21:49 +0100)
committerCarl Eugen Hoyos <cehoyos@ag.or.at>
Thu, 1 Dec 2016 08:53:38 +0000 (09:53 +0100)
Rename hz in af_apulsator.c and avf_showspectrum.c as hertz.

The aix header sys/m_param.h defines hz as __hz.

libavfilter/af_apulsator.c
libavfilter/avf_showspectrum.c

index 802b8d0..67711a2 100644 (file)
@@ -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);
     }
 
index f63fbe8..8a08b20 100644 (file)
@@ -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);