Changeset 00f25e0a in ffmpeg

Timestamp:

Jan 6, 2014, 9:12:29 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

523a803b

Parents:

13f3092b (diff), 01d245e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (01/06/14 21:09:14)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (01/06/14 21:12:29)

Message:

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>

(No files)