Changeset 38336f0f in ffmpeg

Timestamp:

Feb 23, 2014, 9:25:13 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

09824332

Parents:

96ea3dea (diff), 5800ba0d (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> (02/23/14 21:25:08)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (02/23/14 21:25:13)

Message:

Merge commit '5800ba0db667630e6ff81d30f03961ea10726aa6'

• commit '5800ba0db667630e6ff81d30f03961ea10726aa6': configure: disable cpunop if the check fails

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

(No files)