diff options
| author | Michael Niedermayer <[email protected]> | 2014-10-26 03:12:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-10-26 03:12:37 +0100 |
| commit | 4360c6ff610cce5ef0fc844c1e0616aea0204f7e (patch) | |
| tree | dc9c90b74f33d6cf69e646209f184d2d250f7135 /libavcodec/h264_parser.c | |
| parent | 4a39d4c65a72860873daa433eab077ffcff0f913 (diff) | |
| parent | 6b9b42cc5576e1819ad1e29d98940066fd14b2d6 (diff) | |
Merge commit '6b9b42cc5576e1819ad1e29d98940066fd14b2d6'
* commit '6b9b42cc5576e1819ad1e29d98940066fd14b2d6':
drawtext: Remove the ifdef for localtime_r
Conflicts:
libavfilter/vf_drawtext.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/h264_parser.c')
0 files changed, 0 insertions, 0 deletions