Commit 84ca7c28 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'f5fbbbc0'

* commit 'f5fbbbc0':
  mxf: Drop unnecessary checks

Conflicts:
	libavformat/mxfdec.c

See: c5714097Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents d938a013 f5fbbbc0
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment