libavutil/parseutils.h · f6b86b62f785a67a356c87f5ea483a1cbe338191 · Samuel Mira / ffmpeg

9 years ago

Michael Niedermayer authored 9 years ago


* commit '27f27462':
  parseutils: Make av_small_strptime public

Conflicts:
	doc/APIchanges
	libavformat/utils.c
	libavutil/parseutils.c
	libavutil/version.h

See: 29e972f6
Merged-by: Michael Niedermayer <michaelni@gmx.at>

9c37c812

History

Merge commit ''

Michael Niedermayer authored 9 years ago


* commit '27f27462':
  parseutils: Make av_small_strptime public

Conflicts:
	doc/APIchanges
	libavformat/utils.c
	libavutil/parseutils.c
	libavutil/version.h

See: 29e972f6
Merged-by: Michael Niedermayer <michaelni@gmx.at>