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:Michael Niedermayer <michaelni@gmx.at>
Loading
Please register or sign in to comment