* commit '42d73f7f':
  4xm: do not overread while parsing header

Conflicts:
	libavformat/4xm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>