Merge commit '0e1ebfeb'

* commit '0e1ebfeb':
  4xm: drop unnecessary check

Conflicts:
	libavcodec/4xm.c

The check is currently redundant, it is for saftey left in place though
Merged-by: Michael Niedermayer <michaelni@gmx.at>