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)
commit7edb5eec4fd407c55c437aaa5a38d7c8a953c14c
tree0e212cce5208d225f9d1672eee0a81dd92ab6d36
parent76bd8e16af900fe35219ebe55d49151d598d8b80
parent0e1ebfebc8326069732795698a82f3fea0742a54
Merge commit '0e1ebfebc8326069732795698a82f3fea0742a54'

* 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>