1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
FFmpeg/libavutil
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: 29e972f67c914d35417bc7368493d2617abdd26e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-07 20:46:25 +02:00
..
2014-08-05 01:54:47 +02:00
2014-12-19 14:35:29 +01:00
2014-12-19 14:35:29 +01:00
2015-03-20 15:47:31 -03:00
2014-08-13 14:50:15 +02:00
2015-04-02 23:15:57 +02:00
2014-07-12 22:33:27 +02:00
2014-07-12 22:33:27 +02:00
2014-11-08 11:31:11 +01:00
2014-10-11 12:15:26 +02:00
2014-09-05 00:43:48 +02:00
2015-01-12 13:49:56 -03:00
2015-03-05 13:50:22 +01:00
2014-08-05 21:05:52 +02:00
2015-02-18 00:59:55 +01:00