Merge commit '6448f15af02f2c3cf0df8cb8237957e426041f2d'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Mar 2015 18:55:09 +0000 (19:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Mar 2015 18:59:30 +0000 (19:59 +0100)
commitfd503e96ef9b5e6b234bfd0e531176743490d18d
tree7484f1b52855db93a78af4db86a1d5d25126c2ee
parent3360c6ac0c21cbb229c238197f806da40a8bc295
parent6448f15af02f2c3cf0df8cb8237957e426041f2d
Merge commit '6448f15af02f2c3cf0df8cb8237957e426041f2d'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mxfdec.c