diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-24 11:57:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-24 11:57:33 +0200 |
| commit | 63001833c51c3911347ee81520066ac9690b2204 (patch) | |
| tree | 74ccc8e37900294406d386e9270f11e9214d6ffb /ffserver.c | |
| parent | 8fd07fa6cc37550ca120efa7bfbd539ce0e06173 (diff) | |
| parent | e205429fcf9de3182bce2f4cfd1d6401596a8666 (diff) | |
| download | ffmpeg-63001833c51c3911347ee81520066ac9690b2204.tar.gz | |
Merge commit 'e205429fcf9de3182bce2f4cfd1d6401596a8666'
* commit 'e205429fcf9de3182bce2f4cfd1d6401596a8666':
tools: Use av_gettime_relative
See: 41120e6e40e34a840d194883a95c57a6e91b1093
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
0 files changed, 0 insertions, 0 deletions