diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-26 02:26:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-26 02:26:45 +0100 |
| commit | edb069e55689ebff14e689254ce924a30b7bad94 (patch) | |
| tree | 2183c976d0e1658a617e178f6bbb43c80af9ffcc /ffserver.c | |
| parent | 3b709fd912749d7731fa954cfb3aedd18d8a666a (diff) | |
| parent | 3f8f1c6ff24ee858eb5b0bf47ef6d4605299a87e (diff) | |
| download | ffmpeg-edb069e55689ebff14e689254ce924a30b7bad94.tar.gz | |
Merge commit '3f8f1c6ff24ee858eb5b0bf47ef6d4605299a87e'
* commit '3f8f1c6ff24ee858eb5b0bf47ef6d4605299a87e':
lavu: Provide fallbacks for gmtime_r and localtime_r
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
0 files changed, 0 insertions, 0 deletions