[FFmpeg-cvslog] Merge commit '570af382eea902afe09f3562e5e1b483981cca7e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar  6 22:58:46 2014 +0100| [5a4852bc4d6446f1fc158b2e6c41cb0f3c8b98aa] | committer: Michael Niedermayer

Merge commit '570af382eea902afe09f3562e5e1b483981cca7e'

* commit '570af382eea902afe09f3562e5e1b483981cca7e':
  mxf: Handle identification metadata

Conflicts:
	libavformat/mxfdec.c

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

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