Merge commit '0e1ebfebc8326069732795698a82f3fea0742a54'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Nov 2014 20:38:55 +0000 (21:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Nov 2014 20:38:55 +0000 (21:38 +0100)
* commit '0e1ebfebc8326069732795698a82f3fea0742a54':
  4xm: drop unnecessary check

Conflicts:
libavcodec/4xm.c

The check is currently redundant, it is for saftey left in place though

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge