Merge commit '5ba83e90919cdeef38e2b5343b48f3f367292564' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 2 Jun 2013 22:57:23 +0000 (00:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 2 Jun 2013 22:57:23 +0000 (00:57 +0200)
commit30394adc448276b1e8acf0161131c78cf41712e7
tree2e938fa3d1c5661252b0db93a747f6f538f6a5a8
parentf908e3ce92a69b902a8ddd3c3e888fd05a0a605e
parent5ba83e90919cdeef38e2b5343b48f3f367292564
Merge commit '5ba83e90919cdeef38e2b5343b48f3f367292564' into release/1.1

* commit '5ba83e90919cdeef38e2b5343b48f3f367292564':
  wavpack: return meaningful errors

Conflicts:
libavcodec/wavpack.c

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