Browse Source

Merge commit 'f5fbbbc022f723d3ccf99afd5d658a977b51c08a'

* commit 'f5fbbbc022f723d3ccf99afd5d658a977b51c08a':
  mxf: Drop unnecessary checks

Conflicts:
	libavformat/mxfdec.c

See: c5714097eb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.2-rc1
Michael Niedermayer 12 years ago
parent
commit
84ca7c28ce

Diff Content Not Available