[FFmpeg-cvslog] Merge commit '108f2f381acb93827fb4add0517eeae859afa3bf'

Michael Niedermayer git at videolan.org
Tue Apr 7 20:08:53 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Apr  7 19:58:31 2015 +0200| [0739179bfb002324eea20f1c44c5f586b6bd3e04] | committer: Michael Niedermayer

Merge commit '108f2f381acb93827fb4add0517eeae859afa3bf'

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

Conflicts:
	libavutil/parseutils.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0739179bfb002324eea20f1c44c5f586b6bd3e04
---





More information about the ffmpeg-cvslog mailing list