Changeset b67cb585 in ffmpeg

Timestamp:

Oct 7, 2013, 9:37:47 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

49ba6e56

Parents:

57f0f86f (diff), ce1e8045 (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> (10/07/13 09:37:37)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (10/07/13 09:37:47)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: x86: fdct: Employ more specific ifdefs

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

(No files)