Merge commit '8c34558131d846d2b10389564caadaa206372fd4'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 19 May 2013 08:22:05 +0000 (10:22 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 19 May 2013 08:22:05 +0000 (10:22 +0200)
commit2ad415cfa42069cad92803f2bc047b4311aa3c70
tree7c5664036d165ff9ae8654dff909edc4be20201a
parent02788d2ac5dfffd0ce862adea953e73466ee7018
parent8c34558131d846d2b10389564caadaa206372fd4
Merge commit '8c34558131d846d2b10389564caadaa206372fd4'

* commit '8c34558131d846d2b10389564caadaa206372fd4':
  wavpack: return meaningful errors

Conflicts:
libavcodec/wavpack.c

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