OSDN Git Service

Merge commit '01d245ef4392152dbdc78a6ba4dfa0a6e8b08e6f'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Jan 2014 21:09:14 +0000 (22:09 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Jan 2014 21:12:29 +0000 (22:12 +0100)
commit00f25e0a990f9200806fc23d9054a47169db69a2
treecb5b741af2c07b3dd66385bbbe2c3dcae9d99c57
parent13f3092b387fb1e0f9b281e94ae725b537304af6
parent01d245ef4392152dbdc78a6ba4dfa0a6e8b08e6f
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 <michaelni@gmx.at>
libavutil/random_seed.c