* commit 'adb199d1bc7f86aa6b85986f40190ec17f99d34f': kgv1dec: replace forcing EMU_EDGE by a copy Conflicts: libavcodec/kgv1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>