Michael Niedermayer 9c37c81246 Merge commit '27f274628234c1f934b9a6a6380ed567c1b4ceae' ...

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

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

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

2015-04-07 20:46:25 +02:00

7.4 KiB

Raw Blame History

View Raw