[FFmpeg-cvslog] Merge commit '3f0b6d7a6248a33df37b98cfcb37a1acce263f62'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 23 10:46:05 2013 +0200| [402bec52d4d3dd7575fa502f59de30a88983d1c6] | committer: Michael Niedermayer

Merge commit '3f0b6d7a6248a33df37b98cfcb37a1acce263f62'

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

Conflicts:
	libavcodec/wavpack.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=402bec52d4d3dd7575fa502f59de30a88983d1c6
---