ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sun Oct 26
03:12:37 2014 +0100| [4360c6ff610cce5ef0fc844c1e0616aea0204f7e] | committer:
Michael Niedermayer
Merge commit '6b9b42cc5576e1819ad1e29d98940066fd14b2d6'
* commit '6b9b42cc5576e1819ad1e29d98940066fd14b2d6':
drawtext: Remove the ifdef for localtime_r
Conflicts:
libavfilter/vf_drawtext.c
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4360c6ff610cce5ef0fc844c1e0616aea0204f7e
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
