diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-08 11:05:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-12 00:42:35 +0100 |
| commit | 21e42d9b0d3753534365b72bfef1aff9dfa37986 (patch) | |
| tree | 36461ca52ece2f4bc0e0c94278aa68f43353ffb4 | |
| parent | e10c353ca5c34054aa42bbfba3c992ca947c59db (diff) | |
| download | ffmpeg-21e42d9b0d3753534365b72bfef1aff9dfa37986.tar.gz | |
avcodec/aacsbr: Use FLOAT_0
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit dcf1cf5d24c85d848eabac90720d7f77d594a88c)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/aacsbr_fixed.c | 2 | ||||
| -rw-r--r-- | libavcodec/aacsbr_template.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/aacsbr_fixed.c b/libavcodec/aacsbr_fixed.c index e048069359..f942d74615 100644 --- a/libavcodec/aacsbr_fixed.c +++ b/libavcodec/aacsbr_fixed.c @@ -397,7 +397,7 @@ static void sbr_gain_calc(AACContext *ac, SpectralBandReplication *sbr, int delta = !((e == e_a[1]) || (e == e_a[0])); for (k = 0; k < sbr->n_lim; k++) { SoftFloat gain_boost, gain_max; - SoftFloat sum[2] = { { 0, 0}, { 0, 0 } }; + SoftFloat sum[2] = { FLOAT_0, FLOAT_0 }; for (m = sbr->f_tablelim[k] - sbr->kx[1]; m < sbr->f_tablelim[k + 1] - sbr->kx[1]; m++) { const SoftFloat temp = av_div_sf(sbr->e_origmapped[e][m], av_add_sf(FLOAT_1, sbr->q_mapped[e][m])); diff --git a/libavcodec/aacsbr_template.c b/libavcodec/aacsbr_template.c index d31b71e0a8..8a0268d12d 100644 --- a/libavcodec/aacsbr_template.c +++ b/libavcodec/aacsbr_template.c @@ -1412,7 +1412,7 @@ static void sbr_env_estimate(AAC_FLOAT (*e_curr)[48], INTFLOAT X_high[64][40][2] for (p = 0; p < sbr->n[ch_data->bs_freq_res[e + 1]]; p++) { #if USE_FIXED - SoftFloat sum = { 0, 0 }; + SoftFloat sum = FLOAT_0; const SoftFloat den = av_int2sf(0x20000000 / (env_size * (table[p + 1] - table[p])), 29); for (k = table[p]; k < table[p + 1]; k++) { sum = av_add_sf(sum, sbr->dsp.sum_square(X_high[k] + ilb, iub - ilb)); |