aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-04-21 14:02:06 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-04-21 14:02:06 +0200
commitbe9074debcfe9e5ea898d2e69a746e5b75cdae84 (patch)
tree6307e9187edab927447616470a1d6eaf0998f474
parentfa29e89d41658557860ff790570fe68b3c464bd3 (diff)
parent29b3ca743dd02efbe00565c0b997e735e4daa772 (diff)
downloadffmpeg-be9074debcfe9e5ea898d2e69a746e5b75cdae84.tar.gz
Merge commit '29b3ca743dd02efbe00565c0b997e735e4daa772' into release/1.1
* commit '29b3ca743dd02efbe00565c0b997e735e4daa772': drawtext: Drop pointless header Merged-by: Michael Niedermayer <michaelni@gmx.at>
0 files changed, 0 insertions, 0 deletions