Merge commit '04e9853a210e07b1a150aa2b8e9af0aa3601ff21'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Jul 2013 09:33:10 +0000 (11:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Jul 2013 09:33:19 +0000 (11:33 +0200)
commit5698f6bd7334def818b7a3c18fcb09daea8bd1c9
tree74086863b1f7d6c83ea34501ad03c4df6bdc017f
parent2efc2b53be96efc7c647f13af00e48b53c249bdd
parent04e9853a210e07b1a150aa2b8e9af0aa3601ff21
Merge commit '04e9853a210e07b1a150aa2b8e9af0aa3601ff21'

* commit '04e9853a210e07b1a150aa2b8e9af0aa3601ff21':
  wmavoice: return meaningful error codes

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