-
Michael Niedermayer authored
* commit '6b9b42cc': drawtext: Remove the ifdef for localtime_r Conflicts: libavfilter/vf_drawtext.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
4360c6ff
* commit '6b9b42cc': drawtext: Remove the ifdef for localtime_r Conflicts: libavfilter/vf_drawtext.c Merged-by: Michael Niedermayer <michaelni@gmx.at>