* commit 'fe80fa53':
  4xm: replace forcing EMU_EDGE by a copy

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