Merge commit 'adb199d1bc7f86aa6b85986f40190ec17f99d34f'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Jan 2014 12:57:29 +0000 (13:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Jan 2014 13:23:01 +0000 (14:23 +0100)
commit80d44190c4d909e9685d04bcde693da3e2441dfd
tree38024d00022c9e8dd2c15c1b82765b8392c2c42d
parentd1134ababdbd55ef0330c09deccfb32daaa809b5
parentadb199d1bc7f86aa6b85986f40190ec17f99d34f
Merge commit 'adb199d1bc7f86aa6b85986f40190ec17f99d34f'

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

Conflicts:
libavcodec/kgv1dec.c

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