[FFmpeg-cvslog] Merge commit '5074f4545c439420daebe4c2f28ed216440b6ec7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May 28 11:49:30 2013 +0200| [8012f93ed8afbf0b45fa378085cd4b000e30057f] | committer: Michael Niedermayer

Merge commit '5074f4545c439420daebe4c2f28ed216440b6ec7'

* commit '5074f4545c439420daebe4c2f28ed216440b6ec7':
  wavpack demuxer: export full wavpack blocks.

Conflicts:
	libavformat/wv.c

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

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