[FFmpeg-cvslog] Merge commit '794ca87d2bff2513118de8b97595b3e23070e67d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 29 10:06:35 2013 +0200| [53015bb3b340885d576af87afd20479ecb126bf4] | committer: Michael Niedermayer

Merge commit '794ca87d2bff2513118de8b97595b3e23070e67d'

* commit '794ca87d2bff2513118de8b97595b3e23070e67d':
  wvdec: split block header parsing into a separate file

Conflicts:
	libavformat/Makefile
	libavformat/wvdec.c

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

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