* commit '794ca87d2bff2513118de8b97595b3e23070e67d': wvdec: split block header parsing into a separate file Conflicts: libavformat/Makefile libavformat/wvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
It will be reused by other muxers and demuxers.