[FFmpeg-cvslog] Merge commit 'f5fbbbc022f723d3ccf99afd5d658a977b51c08a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 14 22:03:32 2014 +0100| [84ca7c28ce4977cbf71b2c7efbaafea9fc3fbfb2] | committer: Michael Niedermayer

Merge commit 'f5fbbbc022f723d3ccf99afd5d658a977b51c08a'

* commit 'f5fbbbc022f723d3ccf99afd5d658a977b51c08a':
  mxf: Drop unnecessary checks

Conflicts:
	libavformat/mxfdec.c

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

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