[FFmpeg-cvslog] Merge commit 'ad0560fe7491a85c3e71d5a3d6a0443f10b33ab1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct  2 14:55:18 2013 +0200| [c28bca2bdef6c4671c25b1c0b25c489f11ffad80] | committer: Michael Niedermayer

Merge commit 'ad0560fe7491a85c3e71d5a3d6a0443f10b33ab1'

* commit 'ad0560fe7491a85c3e71d5a3d6a0443f10b33ab1':
  mxf: Remove a typo

Conflicts:
	libavformat/mxfdec.c

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

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