* commit 'e7a44f87':
  4xm: refactor fourxm_read_header

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