* commit 'adb199d1':
  kgv1dec: replace forcing EMU_EDGE by a copy

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