Merge commit 'a9099e04026f300924ac363fa6f8aef912677d90'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 21 Feb 2014 19:49:54 +0000 (20:49 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 21 Feb 2014 20:08:53 +0000 (21:08 +0100)
* commit 'a9099e04026f300924ac363fa6f8aef912677d90':
  mxf: Add uncompressed 422 8-bit rawvideo UL

Conflicts:
libavformat/mxf.c

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

Trivial merge