[FFmpeg-cvslog] Merge commit 'af9481d7019d46c9f18c4ccac77a5d0c54cf6004'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 19 21:09:16 2014 +0100| [2ef6c0fdf56903eae4bb945daa62128da2c7fa13] | committer: Michael Niedermayer

Merge commit 'af9481d7019d46c9f18c4ccac77a5d0c54cf6004'

* commit 'af9481d7019d46c9f18c4ccac77a5d0c54cf6004':
  mxf: Lowercase UL strings

Conflicts:
	libavformat/mxfdec.c

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

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