1. ffmpeg
  2. Commit d44af9a38e6b116e1a89b2862f4d4f8cb9855387
Browse code

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.

Carl Eugen Hoyos authored on 2016/11/30 05:49:22
Showing 2 changed files
libavfilter/af_apulsator.c
History View file @ d44af9a
... ... 
@@ -47,7 +47,7 @@ typedef struct AudioPulsatorContext {
47 47 
     double offset_r;
48 48 
     double pwidth;
49 49 
     double bpm;
50 
-    double hz;
50 
+    double hertz;
51 51 
     int ms;
52 52 
     int timing;
53 53
... ... 
@@ -76,7 +76,7 @@ static const AVOption apulsator_options[] = {
76 76 
     {   "hz",                   NULL, 0,                 AV_OPT_TYPE_CONST,  {.i64=UNIT_HZ},   0,          0, FLAGS, "timing" },
77 77 
     { "bpm",               "set BPM", OFFSET(bpm),       AV_OPT_TYPE_DOUBLE, {.dbl=120},    30,          300, FLAGS },
78 78 
     { "ms",                 "set ms", OFFSET(ms),        AV_OPT_TYPE_INT,    {.i64=500},    10,         2000, FLAGS },
79 
-    { "hz",          "set frequency", OFFSET(hz),        AV_OPT_TYPE_DOUBLE, {.dbl=2},    0.01,          100, FLAGS },
79 
+    { "hz",          "set frequency", OFFSET(hertz),     AV_OPT_TYPE_DOUBLE, {.dbl=2},    0.01,          100, FLAGS },
80 80 
     { NULL }
81 81 
 };
82 82
... ... 
@@ -208,7 +208,7 @@ static int config_input(AVFilterLink *inlink)
208 208 
     switch (s->timing) {
209 209 
     case UNIT_BPM:  freq = s->bpm / 60;         break;
210 210 
     case UNIT_MS:   freq = 1 / (s->ms / 1000.); break;
211 
-    case UNIT_HZ:   freq = s->hz;               break;
211 
+    case UNIT_HZ:   freq = s->hertz;            break;
212 212 
     default: av_assert0(0);
213 213 
     }
214 214
libavfilter/avf_showspectrum.c
History View file @ d44af9a
... ... 
@@ -1120,13 +1120,13 @@ static int showspectrumpic_request_frame(AVFilterLink *outlink)
1120 1120 
                         dst[x] = 200;
1121 1121 
                     }
1122 1122 
                     for (y = 0; y < h; y += 40) {
1123 
-                        float hz = y * (inlink->sample_rate / 2) / (float)(1 << (int)ceil(log2(h)));
1123 
+                        float hertz = y * (inlink->sample_rate / 2) / (float)(1 << (int)ceil(log2(h)));
1124 1124 
                         char *units;
1125 1125
1126 
-                        if (hz == 0)
1126 
+                        if (hertz == 0)
1127 1127 
                             units = av_asprintf("DC");
1128 1128 
                         else
1129 
-                            units = av_asprintf("%.2f", hz);
1129 
+                            units = av_asprintf("%.2f", hertz);
1130 1130 
                         if (!units)
1131 1131 
                             return AVERROR(ENOMEM);
1132 1132
... ... 
@@ -1185,13 +1185,13 @@ static int showspectrumpic_request_frame(AVFilterLink *outlink)
1185 1185 
                         dst[x] = 200;
1186 1186 
                     }
1187 1187 
                     for (x = 0; x < w; x += 80) {
1188 
-                        float hz = x * (inlink->sample_rate / 2) / (float)(1 << (int)ceil(log2(w)));
1188 
+                        float hertz = x * (inlink->sample_rate / 2) / (float)(1 << (int)ceil(log2(w)));
1189 1189 
                         char *units;
1190 1190
1191 
-                        if (hz == 0)
1191 
+                        if (hertz == 0)
1192 1192 
                             units = av_asprintf("DC");
1193 1193 
                         else
1194 
-                            units = av_asprintf("%.2f", hz);
1194 
+                            units = av_asprintf("%.2f", hertz);
1195 1195 
                         if (!units)
1196 1196 
                             return AVERROR(ENOMEM);
1197 1197