Merge remote-tracking branch 'newdev/master'

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-21 03:09:46 +01:00
parent 849f80fecb cf752d027f
commit d4a50a2100
44 changed files with 458 additions and 275 deletions
--- a/libavcodec/wma.c
+++ b/libavcodec/wma.c
@@ -20,6 +20,7 @@
 */

 #include "avcodec.h"
+#include "sinewin.h"
 #include "wma.h"
 #include "wmadata.h"