Commit f93bd82e authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'a9099e04'

* commit 'a9099e04':
  mxf: Add uncompressed 422 8-bit rawvideo UL

Conflicts:
	libavformat/mxf.c

See: 51d632ccMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents b295bce1 a9099e04
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