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

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