diff options
| author | Diego Elio Pettenò <flameeyes@gmail.com> | 2011-01-24 23:36:10 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-01-26 03:43:29 +0100 |
| commit | ee7fed27d452c7a7be2457d4230eafb084e010c5 (patch) | |
| tree | e259f028b2bcd43a0f1d47d243d312979cb3139a /libavcodec | |
| parent | f7e5cc0a2cc736af8543c256fb761d26f3249d9e (diff) | |
| download | ffmpeg-ee7fed27d452c7a7be2457d4230eafb084e010c5.tar.gz | |
Rename sf_table in atrac.c unit to ff_atrac_sf_table.
This ensures a locally-unique name as well as marks the symbol as
FFmpeg-private at least by declaration.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 82e1f217f276b4b3fda1f89a836126275a97ca9b)
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/atrac.c | 6 | ||||
| -rw-r--r-- | libavcodec/atrac.h | 3 | ||||
| -rw-r--r-- | libavcodec/atrac1.c | 2 | ||||
| -rw-r--r-- | libavcodec/atrac3.c | 4 |
4 files changed, 7 insertions, 8 deletions
diff --git a/libavcodec/atrac.c b/libavcodec/atrac.c index 1f7a69e2f8..6c1b1f19ce 100644 --- a/libavcodec/atrac.c +++ b/libavcodec/atrac.c @@ -32,7 +32,7 @@ #include "dsputil.h" #include "atrac.h" -float sf_table[64]; +float ff_atrac_sf_table[64]; static float qmf_window[48]; static const float qmf_48tap_half[24] = { @@ -54,9 +54,9 @@ void atrac_generate_tables(void) float s; /* Generate scale factors */ - if (!sf_table[63]) + if (!ff_atrac_sf_table[63]) for (i=0 ; i<64 ; i++) - sf_table[i] = pow(2.0, (i - 15) / 3.0); + ff_atrac_sf_table[i] = pow(2.0, (i - 15) / 3.0); /* Generate the QMF window. */ if (!qmf_window[47]) diff --git a/libavcodec/atrac.h b/libavcodec/atrac.h index acaa4ce041..e126935e12 100644 --- a/libavcodec/atrac.h +++ b/libavcodec/atrac.h @@ -28,8 +28,7 @@ #ifndef AVCODEC_ATRAC_H #define AVCODEC_ATRAC_H - -extern float sf_table[64]; +extern float ff_atrac_sf_table[64]; void atrac_generate_tables(void); void atrac_iqmf (float *inlo, float *inhi, unsigned int nIn, float *pOut, float *delayBuf, float *temp); diff --git a/libavcodec/atrac1.c b/libavcodec/atrac1.c index 513ecc7d8b..c4404f6817 100644 --- a/libavcodec/atrac1.c +++ b/libavcodec/atrac1.c @@ -223,7 +223,7 @@ static int at1_unpack_dequant(GetBitContext* gb, AT1SUCtx* su, int num_specs = specs_per_bfu[bfu_num]; int word_len = !!idwls[bfu_num] + idwls[bfu_num]; - float scale_factor = sf_table[idsfs[bfu_num]]; + float scale_factor = ff_atrac_sf_table[idsfs[bfu_num]]; bits_used += word_len * num_specs; /* add number of bits consumed by current BFU */ /* check for bitstream overflow */ diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c index cc13b730ab..214cec7faa 100644 --- a/libavcodec/atrac3.c +++ b/libavcodec/atrac3.c @@ -327,7 +327,7 @@ static int decodeSpectrum (GetBitContext *gb, float *pOut) readQuantSpectralCoeffs (gb, subband_vlc_index[cnt], codingMode, mantissas, subbWidth); /* Decode the scale factor for this subband. */ - SF = sf_table[SF_idxs[cnt]] * iMaxQuant[subband_vlc_index[cnt]]; + SF = ff_atrac_sf_table[SF_idxs[cnt]] * iMaxQuant[subband_vlc_index[cnt]]; /* Inverse quantize the coefficients. */ for (pIn=mantissas ; first<last; first++, pIn++) @@ -400,7 +400,7 @@ static int decodeTonalComponents (GetBitContext *gb, tonal_component *pComponent coded_values = coded_values_per_component + 1; coded_values = FFMIN(max_coded_values,coded_values); - scalefactor = sf_table[sfIndx] * iMaxQuant[quant_step_index]; + scalefactor = ff_atrac_sf_table[sfIndx] * iMaxQuant[quant_step_index]; readQuantSpectralCoeffs(gb, quant_step_index, coding_mode, mantissa, coded_values); |