Merge commit 'f20518568a77a6138fc74021ce56013ab72907ba'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 4 Sep 2014 17:46:06 +0000 (19:46 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 4 Sep 2014 17:46:06 +0000 (19:46 +0200)
commit5a20f1885d3b521afc8c63734cff724da0a87815
tree0821c4d69bded8920fb886d2937023d758fd59ac
parent91a8b933fb6d9bf41f5885793bfcc0cb24de6100
parentf20518568a77a6138fc74021ce56013ab72907ba
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>
configure
libavcodec/Makefile
libavcodec/binkaudio.c
libavcodec/wma.c
libavcodec/wma.h
libavcodec/wma_freqs.c
libavcodec/wma_freqs.h
libavcodec/wmadata.h