Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Jul 2013 09:50:10 +0000 (11:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Jul 2013 09:50:18 +0000 (11:50 +0200)
commit531f0169444cd6358334daf09417045f8e6ff956
treefd7fca1993a866f60bd64ef312500cb67c8643d7
parent45cc62f0a099b75e75c6a4ad57bca640bd6daf32
parentd14a26edb7c4487df581f11e5c6911dc0e623d08
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  wmavoice: conceal clearly corrupted blocks

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