[FFmpeg-cvslog] Merge commit '98c9ade9853a9c413534ef243174d65f3f7506fa'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Wed Aug  5 12:18:31 2015 +0200| [7e2717ba3c645dbfc5d97e763bc79e73665739ec] | committer: Hendrik Leppkes

Merge commit '98c9ade9853a9c413534ef243174d65f3f7506fa'

* commit '98c9ade9853a9c413534ef243174d65f3f7506fa':
  drawtext: Move the strftime expansion in a separate function

Not merged, the code does not exist anymore.

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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