[FFmpeg-cvslog] Merge commit '6448f15af02f2c3cf0df8cb8237957e426041f2d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar  8 19:55:09 2015 +0100| [fd503e96ef9b5e6b234bfd0e531176743490d18d] | committer: Michael Niedermayer

Merge commit '6448f15af02f2c3cf0df8cb8237957e426041f2d'

* commit '6448f15af02f2c3cf0df8cb8237957e426041f2d':
  mxfdec: Fix the error handling for when strftime fails

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

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