Changeset 3b6e8634 in ffmpeg

Timestamp:

Dec 20, 2013, 12:00:21 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

3f307d79

Parents:

a165964f (diff), 8558595a (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> (12/20/13 11:48:16)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (12/20/13 12:00:21)

Message:

Merge commit '8558595a59913a4667f57d5a4658b1340f1a4354'

• commit '8558595a59913a4667f57d5a4658b1340f1a4354': configure: Express atomics/thread deps through the dependency system

Conflicts:

configure

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)