Merge commit '6b9b42cc5576e1819ad1e29d98940066fd14b2d6'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 26 Oct 2014 02:12:37 +0000 (03:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 26 Oct 2014 02:12:37 +0000 (03:12 +0100)
commit4360c6ff610cce5ef0fc844c1e0616aea0204f7e
treedc9c90b74f33d6cf69e646209f184d2d250f7135
parent4a39d4c65a72860873daa433eab077ffcff0f913
parent6b9b42cc5576e1819ad1e29d98940066fd14b2d6
Merge commit '6b9b42cc5576e1819ad1e29d98940066fd14b2d6'

* commit '6b9b42cc5576e1819ad1e29d98940066fd14b2d6':
  drawtext: Remove the ifdef for localtime_r

Conflicts:
libavfilter/vf_drawtext.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/vf_drawtext.c