Merge commit '27f274628234c1f934b9a6a6380ed567c1b4ceae'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 7 Apr 2015 18:34:24 +0000 (20:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 7 Apr 2015 18:46:25 +0000 (20:46 +0200)
commit9c37c81246146ef45bba59546cc611a6e26a5b21
tree93649b11f0eab88bffbba9bcf7d66282ad057b73
parent0739179bfb002324eea20f1c44c5f586b6bd3e04
parent27f274628234c1f934b9a6a6380ed567c1b4ceae
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>
libavformat/utils.c
libavutil/parseutils.h
libavutil/version.h