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/binkaudio.c | |
| 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/binkaudio.c')
| -rw-r--r-- | libavcodec/binkaudio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c index ffa32d12aa..064ee7e2c1 100644 --- a/libavcodec/binkaudio.c +++ b/libavcodec/binkaudio.c @@ -36,7 +36,7 @@ #include "rdft.h" #include "fmtconvert.h" #include "internal.h" -#include "wma.h" +#include "wma_freqs.h" #include "libavutil/intfloat.h" static float quant_table[96]; |