diff options
| author | Michael Niedermayer <[email protected]> | 2014-01-06 22:09:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-01-06 22:12:29 +0100 |
| commit | 00f25e0a990f9200806fc23d9054a47169db69a2 (patch) | |
| tree | cb5b741af2c07b3dd66385bbbe2c3dcae9d99c57 /tools/qt-faststart.c | |
| parent | 13f3092b387fb1e0f9b281e94ae725b537304af6 (diff) | |
| parent | 01d245ef4392152dbdc78a6ba4dfa0a6e8b08e6f (diff) | |
Merge commit '01d245ef4392152dbdc78a6ba4dfa0a6e8b08e6f'
* commit '01d245ef4392152dbdc78a6ba4dfa0a6e8b08e6f':
random_seed: Rewrite the generic clock() based seed code
Conflicts:
libavutil/random_seed.c
See: 66531c75d3bfd8a013acd8bd3c04a131dae2a1a0
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'tools/qt-faststart.c')
0 files changed, 0 insertions, 0 deletions