* commit 'fbd0dacc':
  4xm: refactor decode_p_block

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