Merge commit 'f5c48f5adaead5259660d4eaab2e695d1bac3a08'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Jul 2013 09:41:26 +0000 (11:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Jul 2013 09:41:34 +0000 (11:41 +0200)
commit45cc62f0a099b75e75c6a4ad57bca640bd6daf32
tree8bbf49d9062bd27a830e73e08a206c98bac031f0
parent5698f6bd7334def818b7a3c18fcb09daea8bd1c9
parentf5c48f5adaead5259660d4eaab2e695d1bac3a08
Merge commit 'f5c48f5adaead5259660d4eaab2e695d1bac3a08'

* commit 'f5c48f5adaead5259660d4eaab2e695d1bac3a08':
  wmavoice: use init_static_data

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/wmavoice.c