diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-26 02:38:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-26 02:38:26 +0100 |
| commit | 4a39d4c65a72860873daa433eab077ffcff0f913 (patch) | |
| tree | 62a159e840174773f7ca5927066bd4c2c507a0de /libavfilter/vf_drawtext.c | |
| parent | edb069e55689ebff14e689254ce924a30b7bad94 (diff) | |
| parent | 82ee7d0dda0fec8cdb670f4e844bf5c2927ad9de (diff) | |
Merge commit '82ee7d0dda0fec8cdb670f4e844bf5c2927ad9de'
* commit '82ee7d0dda0fec8cdb670f4e844bf5c2927ad9de':
Use gmtime_r instead of gmtime and localtime_r instead of localtime
Conflicts:
libavformat/mov.c
libavformat/mxfenc.c
libavformat/wtvdec.c
libavutil/parseutils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_drawtext.c')
0 files changed, 0 insertions, 0 deletions