Revision ee7fed27

View differences:

libavcodec/atrac.c
32 32
#include "dsputil.h"
33 33
#include "atrac.h"
34 34

  
35
float sf_table[64];
35
float ff_atrac_sf_table[64];
36 36
static float qmf_window[48];
37 37

  
38 38
static const float qmf_48tap_half[24] = {
......
54 54
    float s;
55 55

  
56 56
    /* Generate scale factors */
57
    if (!sf_table[63])
57
    if (!ff_atrac_sf_table[63])
58 58
        for (i=0 ; i<64 ; i++)
59
            sf_table[i] = pow(2.0, (i - 15) / 3.0);
59
            ff_atrac_sf_table[i] = pow(2.0, (i - 15) / 3.0);
60 60

  
61 61
    /* Generate the QMF window. */
62 62
    if (!qmf_window[47])
libavcodec/atrac.h
28 28
#ifndef AVCODEC_ATRAC_H
29 29
#define AVCODEC_ATRAC_H
30 30

  
31

  
32
extern float sf_table[64];
31
extern float ff_atrac_sf_table[64];
33 32

  
34 33
void atrac_generate_tables(void);
35 34
void atrac_iqmf (float *inlo, float *inhi, unsigned int nIn, float *pOut, float *delayBuf, float *temp);
libavcodec/atrac1.c
223 223

  
224 224
            int num_specs = specs_per_bfu[bfu_num];
225 225
            int word_len  = !!idwls[bfu_num] + idwls[bfu_num];
226
            float scale_factor = sf_table[idsfs[bfu_num]];
226
            float scale_factor = ff_atrac_sf_table[idsfs[bfu_num]];
227 227
            bits_used += word_len * num_specs; /* add number of bits consumed by current BFU */
228 228

  
229 229
            /* check for bitstream overflow */
libavcodec/atrac3.c
327 327
            readQuantSpectralCoeffs (gb, subband_vlc_index[cnt], codingMode, mantissas, subbWidth);
328 328

  
329 329
            /* Decode the scale factor for this subband. */
330
            SF = sf_table[SF_idxs[cnt]] * iMaxQuant[subband_vlc_index[cnt]];
330
            SF = ff_atrac_sf_table[SF_idxs[cnt]] * iMaxQuant[subband_vlc_index[cnt]];
331 331

  
332 332
            /* Inverse quantize the coefficients. */
333 333
            for (pIn=mantissas ; first<last; first++, pIn++)
......
400 400
                coded_values = coded_values_per_component + 1;
401 401
                coded_values = FFMIN(max_coded_values,coded_values);
402 402

  
403
                scalefactor = sf_table[sfIndx] * iMaxQuant[quant_step_index];
403
                scalefactor = ff_atrac_sf_table[sfIndx] * iMaxQuant[quant_step_index];
404 404

  
405 405
                readQuantSpectralCoeffs(gb, quant_step_index, coding_mode, mantissa, coded_values);
406 406

  

Also available in: Unified diff