* commit 'fffca3d278c2a2422c2f61f21c5a9d5f690d328e':
4xm: return a proper error code.
Conflicts:
libavcodec/4xm.c
See: a5e382ad7f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/53/head
commit
d701f5996d