From: Michael Niedermayer <michaelni@gmx.at>
Date: Thu, 11 Jul 2013 09:41:26 +0000 (+0200)
Subject: Merge commit 'f5c48f5adaead5259660d4eaab2e695d1bac3a08'
X-Git-Tag: android-x86-4.4-r1~2404
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=45cc62f0a099b75e75c6a4ad57bca640bd6daf32;p=android-x86%2Fexternal-ffmpeg.git

Merge commit 'f5c48f5adaead5259660d4eaab2e695d1bac3a08'

* commit 'f5c48f5adaead5259660d4eaab2e695d1bac3a08':
  wmavoice: use init_static_data

Merged-by: Michael Niedermayer <michaelni@gmx.at>
---

45cc62f0a099b75e75c6a4ad57bca640bd6daf32