diff options
| author | Daniel Verkamp <daniel@drv.nu> | 2010-01-23 08:39:50 +0000 |
|---|---|---|
| committer | Daniel Verkamp <daniel@drv.nu> | 2010-01-23 08:39:50 +0000 |
| commit | a7e6328cba02f07d5e8e358f473e1cff272175e6 (patch) | |
| tree | d97ee4efa4932c885f91d50b722960afeffd4712 | |
| parent | 7a086a852cca662ceb54d88383d74dd366914dd6 (diff) | |
| download | ffmpeg-a7e6328cba02f07d5e8e358f473e1cff272175e6.tar.gz | |
Export wma_critical_freqs as ff_wma_critical_freqs
Originally committed as revision 21391 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/wma.c | 4 | ||||
| -rw-r--r-- | libavcodec/wma.h | 1 | ||||
| -rw-r--r-- | libavcodec/wmadata.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/wma.c b/libavcodec/wma.c index 3322d0ed6a..65780459aa 100644 --- a/libavcodec/wma.c +++ b/libavcodec/wma.c @@ -242,7 +242,7 @@ int ff_wma_init(AVCodecContext *avctx, int flags2) 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 @@ int ff_wma_init(AVCodecContext *avctx, int flags2) 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 --git a/libavcodec/wma.h b/libavcodec/wma.h index 437d8432c1..da06003782 100644 --- a/libavcodec/wma.h +++ b/libavcodec/wma.h @@ -139,6 +139,7 @@ typedef struct WMACodecContext { #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 --git a/libavcodec/wmadata.h b/libavcodec/wmadata.h index 0a26ea4802..4b56b2f2bc 100644 --- a/libavcodec/wmadata.h +++ b/libavcodec/wmadata.h @@ -30,7 +30,7 @@ #include <stdint.h> #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, |