[FFmpeg-cvslog] Merge commit '304089aca7d238ae184e09993b5c737aa22e2c2c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Aug 17 21:49:27 2014 +0200| [ecb7f1dd52798e591984b31009e8d13dc95958b2] | committer: Michael Niedermayer

Merge commit '304089aca7d238ae184e09993b5c737aa22e2c2c'

* commit '304089aca7d238ae184e09993b5c737aa22e2c2c':
  mxf: Add UID print helpers

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ecb7f1dd52798e591984b31009e8d13dc95958b2
---