[FFmpeg-cvslog] Merge commit '8cafeb8bca5d079041739dbd72ccec0ead138eaf'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 10 11:51:40 2014 +0100| [4c63beeefe9fcd42f12fe5545a63bb8114e8bea0] | committer: Michael Niedermayer

Merge commit '8cafeb8bca5d079041739dbd72ccec0ead138eaf'

* commit '8cafeb8bca5d079041739dbd72ccec0ead138eaf':
  mxfdec: Validate parameters to strftime

Conflicts:
	libavformat/mxfdec.c

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

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