aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClément Bœsch <u@pkh.me>2017-03-26 20:41:41 +0200
committerClément Bœsch <u@pkh.me>2017-03-29 14:49:29 +0200
commit8f9edf89d5d4a90eed4a798175e97e07a885ab79 (patch)
treec5f711238fb7302f77862125315e3be7bb96724a
parent2d12b910f71093b782726d00b94643f7f21ca27d (diff)
downloadffmpeg-8f9edf89d5d4a90eed4a798175e97e07a885ab79.tar.gz
lavfi/dynaudnorm: rename pow2 to pow_2
This conflict with the DJGPP libc which includes a pow2 function¹ We cannot make DJGPP POSIX only (using -D_POSIX_SOURCE) to avoid this kind of symbols conflicts due to the lack of both posix_memalign and memalign (DJGPP non standard function) in that POSIX mode. We currently rely on memalign for aligned heap allocation. [1]: http://www.delorie.com/djgpp/doc/libc-2.02/libc_536.html
-rw-r--r--libavfilter/af_dynaudnorm.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libavfilter/af_dynaudnorm.c b/libavfilter/af_dynaudnorm.c
index ddbef26ab5..aa5b28e647 100644
--- a/libavfilter/af_dynaudnorm.c
+++ b/libavfilter/af_dynaudnorm.c
@@ -341,7 +341,7 @@ static inline double fade(double prev, double next, int pos,
return fade_factors[0][pos] * prev + fade_factors[1][pos] * next;
}
-static inline double pow2(const double value)
+static inline double pow_2(const double value)
{
return value * value;
}
@@ -384,7 +384,7 @@ static double compute_frame_rms(AVFrame *frame, int channel)
const double *data_ptr = (double *)frame->extended_data[c];
for (i = 0; i < frame->nb_samples; i++) {
- rms_value += pow2(data_ptr[i]);
+ rms_value += pow_2(data_ptr[i]);
}
}
@@ -392,7 +392,7 @@ static double compute_frame_rms(AVFrame *frame, int channel)
} else {
const double *data_ptr = (double *)frame->extended_data[channel];
for (i = 0; i < frame->nb_samples; i++) {
- rms_value += pow2(data_ptr[i]);
+ rms_value += pow_2(data_ptr[i]);
}
rms_value /= frame->nb_samples;
@@ -545,7 +545,7 @@ static double compute_frame_std_dev(DynamicAudioNormalizerContext *s,
const double *data_ptr = (double *)frame->extended_data[c];
for (i = 0; i < frame->nb_samples; i++) {
- variance += pow2(data_ptr[i]); // Assume that MEAN is *zero*
+ variance += pow_2(data_ptr[i]); // Assume that MEAN is *zero*
}
}
variance /= (s->channels * frame->nb_samples) - 1;
@@ -553,7 +553,7 @@ static double compute_frame_std_dev(DynamicAudioNormalizerContext *s,
const double *data_ptr = (double *)frame->extended_data[channel];
for (i = 0; i < frame->nb_samples; i++) {
- variance += pow2(data_ptr[i]); // Assume that MEAN is *zero*
+ variance += pow_2(data_ptr[i]); // Assume that MEAN is *zero*
}
variance /= frame->nb_samples - 1;
}