Skip to content
Snippets Groups Projects
Commit 9c37c812 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '27f27462'


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

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

See: 29e972f6
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 0739179b 27f27462
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment