Merge commit 'f5fbbbc022f723d3ccf99afd5d658a977b51c08a'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 14 Jan 2014 21:03:32 +0000 (22:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 14 Jan 2014 21:03:32 +0000 (22:03 +0100)
commit84ca7c28ce4977cbf71b2c7efbaafea9fc3fbfb2
treeb164ec207870350d068a884578264e30b1b3dd62
parentd938a013af7607485eac4d0af1d8f5d08bac778e
parentf5fbbbc022f723d3ccf99afd5d658a977b51c08a
Merge commit 'f5fbbbc022f723d3ccf99afd5d658a977b51c08a'

* commit 'f5fbbbc022f723d3ccf99afd5d658a977b51c08a':
  mxf: Drop unnecessary checks

Conflicts:
libavformat/mxfdec.c

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