* commit '108f2f38':
  parseutils: Extend small_strptime to be used in avformat

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