diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-04 19:46:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-04 19:46:06 +0200 |
| commit | 5a20f1885d3b521afc8c63734cff724da0a87815 (patch) | |
| tree | 0821c4d69bded8920fb886d2937023d758fd59ac /libavcodec/wmadata.h | |
| parent | 91a8b933fb6d9bf41f5885793bfcc0cb24de6100 (diff) | |
| parent | f20518568a77a6138fc74021ce56013ab72907ba (diff) | |
| download | ffmpeg-5a20f1885d3b521afc8c63734cff724da0a87815.tar.gz | |
Merge commit 'f20518568a77a6138fc74021ce56013ab72907ba'
* commit 'f20518568a77a6138fc74021ce56013ab72907ba':
build: Split WMA frequencies into a separate object file
Conflicts:
configure
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wmadata.h')
| -rw-r--r-- | libavcodec/wmadata.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/libavcodec/wmadata.h b/libavcodec/wmadata.h index 5318cdc929..641cb1813c 100644 --- a/libavcodec/wmadata.h +++ b/libavcodec/wmadata.h @@ -31,13 +31,6 @@ #include "wma.h" -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, - 24500, -}; - /* first value is number of bands */ static const uint8_t exponent_band_22050[3][25] = { { 10, 4, 8, 4, 8, 8, 12, 20, 24, 24, 16, }, |