Merge commit '3f0b6d7a6248a33df37b98cfcb37a1acce263f62'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 23 May 2013 08:46:05 +0000 (10:46 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 23 May 2013 08:46:05 +0000 (10:46 +0200)
commit402bec52d4d3dd7575fa502f59de30a88983d1c6
tree76a5fda2434788ea2ecaf77d1ca55c9820bfb565
parent1fded9b69cc7af81fbc9ebd957a35e5d544eafb4
parent3f0b6d7a6248a33df37b98cfcb37a1acce263f62
Merge commit '3f0b6d7a6248a33df37b98cfcb37a1acce263f62'

* commit '3f0b6d7a6248a33df37b98cfcb37a1acce263f62':
  wavpack: use bytestream2 in wavpack_decode_block

Conflicts:
libavcodec/wavpack.c

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