]> git.sesse.net Git - ffmpeg/commit
projects / ffmpeg / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4eded22 98c9ade)
Merge commit '98c9ade9853a9c413534ef243174d65f3f7506fa'
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 5 Aug 2015 10:18:31 +0000 (12:18 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 5 Aug 2015 10:18:31 +0000 (12:18 +0200)
commit7e2717ba3c645dbfc5d97e763bc79e73665739ec
treef7e3b814bd62ac70daa8667bcbf7580f166c4917tree | snapshot
parent4eded225ade30ee92a02a76e644969edbe8f61dccommit | diff
parent98c9ade9853a9c413534ef243174d65f3f7506facommit | diff
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@gmail.com>
Unnamed repository; edit this file 'description' to name the repository.