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)
* commit 'f5c48f5adaead5259660d4eaab2e695d1bac3a08':
  wmavoice: use init_static_data

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

Simple merge