Merge commit '304089aca7d238ae184e09993b5c737aa22e2c2c'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Aug 2014 19:49:27 +0000 (21:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Aug 2014 19:50:06 +0000 (21:50 +0200)
* commit '304089aca7d238ae184e09993b5c737aa22e2c2c':
  mxf: Add UID print helpers

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

Simple merge
Simple merge