[FFmpeg-cvslog] Merge commit '01d245ef4392152dbdc78a6ba4dfa0a6e8b08e6f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan  6 22:09:14 2014 +0100| [00f25e0a990f9200806fc23d9054a47169db69a2] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=00f25e0a990f9200806fc23d9054a47169db69a2
---