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)
* commit '747cd9560c2248ff2834f29cd2190646330e4676':
  mxf: Add the UL for the MPEG2VideoDescriptor

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

Simple merge