Changeset 3638f56d in ffmpeg

Timestamp:

Nov 1, 2011, 11:07:51 PM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

c36edf38

Parents:

3fd0f6ed (diff), 7b7b220c (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> (11/01/11 23:07:44)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/01/11 23:07:51)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: Enable w32threads automatically unless explicitly disabled

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

(No files)