Changeset 3f307d79 in ffmpeg

Timestamp:

Dec 20, 2013, 12:16:56 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

241eccd6

Parents:

3b6e8634 (diff), e1b9de4f (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 12:09:39)

git-committer:

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

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: atomics: cosmetics: Restructure ifdefs for greater clarity

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

(No files)