Merge commit '9dcf2397219ca796f0fafce2a703770d6fd09920'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 26 Oct 2014 01:06:40 +0000 (02:06 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 26 Oct 2014 01:06:40 +0000 (02:06 +0100)
commit3b709fd912749d7731fa954cfb3aedd18d8a666a
treea03db8b7a73f30593cae44159cf17042aaf9ce15
parent50697ac5b2e7151b7e29299a5e36aef17695f9c4
parent9dcf2397219ca796f0fafce2a703770d6fd09920
Merge commit '9dcf2397219ca796f0fafce2a703770d6fd09920'

* commit '9dcf2397219ca796f0fafce2a703770d6fd09920':
  lavf: Check the return value of strftime

Conflicts:
libavformat/wtvdec.c

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