# HG changeset patch # User daniel # Date 1264235990 0 # Node ID c29ee479e359aceebc4bbafaa9d8af569dded396 # Parent d27deb92257bda65a997f273402c66541572b22d Export wma_critical_freqs as ff_wma_critical_freqs diff -r d27deb92257b -r c29ee479e359 wma.c --- a/wma.c Fri Jan 22 23:40:18 2010 +0000 +++ b/wma.c Sat Jan 23 08:39:50 2010 +0000 @@ -242,7 +242,7 @@ if (s->version == 1) { lpos = 0; for (i = 0; i < 25; i++) { - a = wma_critical_freqs[i]; + a = ff_wma_critical_freqs[i]; b = s->sample_rate; pos = ((block_len * 2 * a) + (b >> 1)) / b; if (pos > block_len) @@ -277,7 +277,7 @@ j = 0; lpos = 0; for (i = 0; i < 25; i++) { - a = wma_critical_freqs[i]; + a = ff_wma_critical_freqs[i]; b = s->sample_rate; pos = ((block_len * 2 * a) + (b << 1)) / (4 * b); pos <<= 2; diff -r d27deb92257b -r c29ee479e359 wma.h --- a/wma.h Fri Jan 22 23:40:18 2010 +0000 +++ b/wma.h Sat Jan 23 08:39:50 2010 +0000 @@ -139,6 +139,7 @@ #endif } WMACodecContext; +extern const uint16_t ff_wma_critical_freqs[25]; extern const uint16_t ff_wma_hgain_huffcodes[37]; extern const uint8_t ff_wma_hgain_huffbits[37]; extern const float ff_wma_lsp_codebook[NB_LSP_COEFS][16]; diff -r d27deb92257b -r c29ee479e359 wmadata.h --- a/wmadata.h Fri Jan 22 23:40:18 2010 +0000 +++ b/wmadata.h Sat Jan 23 08:39:50 2010 +0000 @@ -30,7 +30,7 @@ #include #include "wma.h" -static const uint16_t wma_critical_freqs[25] = { +const uint16_t ff_wma_critical_freqs[25] = { 100, 200, 300, 400, 510, 630, 770, 920, 1080, 1270, 1480, 1720, 2000, 2320, 2700, 3150, 3700, 4400, 5300, 6400, 7700, 9500, 12000, 15500,