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)
* commit '6448f15af02f2c3cf0df8cb8237957e426041f2d':
  mxfdec: Fix the error handling for when strftime fails

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

Simple merge