[FFmpeg-cvslog] Merge commit '0e1ebfebc8326069732795698a82f3fea0742a54'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov 11 21:38:55 2014 +0100| [7edb5eec4fd407c55c437aaa5a38d7c8a953c14c] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7edb5eec4fd407c55c437aaa5a38d7c8a953c14c
---