diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2016-11-29 21:49:22 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2016-12-01 09:53:38 +0100 |
| commit | d44af9a38e6b116e1a89b2862f4d4f8cb9855387 (patch) | |
| tree | 9ff40ec17bbfce52190b2a64288136db9ec92f60 /libavfilter/avf_showspectrum.c | |
| parent | 4e6d1c1f4ec83000a067ff14452b34c1f2d2a43a (diff) | |
| download | ffmpeg-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.
Diffstat (limited to 'libavfilter/avf_showspectrum.c')
| -rw-r--r-- | libavfilter/avf_showspectrum.c | 12 |
1 files changed, 6 insertions, 6 deletions
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); |