[FFmpeg-cvslog] Merge commit '5b977c1d4fd99f325049d48fb8f0a3240d50eef8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar  6 23:53:36 2014 +0100| [39f5003a07db14c3a98617c052570383c6c0fd35] | committer: Michael Niedermayer

Merge commit '5b977c1d4fd99f325049d48fb8f0a3240d50eef8'

* commit '5b977c1d4fd99f325049d48fb8f0a3240d50eef8':
  mxf: Return meaningful errors

Conflicts:
	libavformat/mxfdec.c

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

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