Merge commit '747cd9560c2248ff2834f29cd2190646330e4676'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Aug 2014 20:00:46 +0000 (22:00 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Aug 2014 20:00:50 +0000 (22:00 +0200)
commit887d85fdcc4737e2bdc076123631db33cdad0c6b
tree2684fe0da84d03327aa71defd88ea1429ad696fe
parentecb7f1dd52798e591984b31009e8d13dc95958b2
parent747cd9560c2248ff2834f29cd2190646330e4676
Merge commit '747cd9560c2248ff2834f29cd2190646330e4676'

* commit '747cd9560c2248ff2834f29cd2190646330e4676':
  mxf: Add the UL for the MPEG2VideoDescriptor

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mxfdec.c