Merge commit 'aa15afb7ce850e2ac688efdef189df5da817a646' n1.2-dev
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 6 Jan 2013 22:41:19 +0000 (23:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 6 Jan 2013 22:41:19 +0000 (23:41 +0100)
commita2aeaff40f34cb54bef55240f9cb8046385087d7
tree8c7543ed2aa6030829ba402ec70d028864cd2dad
parent58edabb198e0c881d8bb6ae8a88df037c24c71eb
parentaa15afb7ce850e2ac688efdef189df5da817a646
Merge commit 'aa15afb7ce850e2ac688efdef189df5da817a646'

* commit 'aa15afb7ce850e2ac688efdef189df5da817a646':
  4xm: simplify code with FFSWAP
  4xm: return meaningful error codes

Conflicts:
libavcodec/4xm.c

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