Merge commit 'fe80fa53bc4977ef6e8e749a9df8ca5590a09307'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Jan 2014 12:48:46 +0000 (13:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Jan 2014 12:51:01 +0000 (13:51 +0100)
commitd1134ababdbd55ef0330c09deccfb32daaa809b5
treee5f9df34d172f8e1b34823d26eb7da4e6b10f045
parentd701f5996daf64f5abac8e402b7b62d5c48c63e1
parentfe80fa53bc4977ef6e8e749a9df8ca5590a09307
Merge commit 'fe80fa53bc4977ef6e8e749a9df8ca5590a09307'

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

Conflicts:
libavcodec/4xm.c

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