Merge commit '1d177200ce1ffd8902729e3a4d647b04fc4b35f8'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 28 May 2013 09:13:00 +0000 (11:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 28 May 2013 09:13:14 +0000 (11:13 +0200)
commit2ba0953ee4bdc478e7ec1bd42bfa3aed7d810442
tree88c2117452ab3d1fe0592dafc9b3445854fa23ee
parent8d4e934df94e7324d56a13abca22c3cc21f2ac7d
parent1d177200ce1ffd8902729e3a4d647b04fc4b35f8
Merge commit '1d177200ce1ffd8902729e3a4d647b04fc4b35f8'

* commit '1d177200ce1ffd8902729e3a4d647b04fc4b35f8':
  wavpack: remove a useless check.

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